sync `integrations/makeswift` with `canary` #423

Job	Run time
E2E Functional Tests (alternate locale)	1m 42s
E2E Functional Tests (default)	20m 32s
E2E Functional Tests (TRAILING_SLASH=false)	1m 32s
	23m 46s

Provide feedback