Fix merging
Merge branch 'website_slot_swap' into website_slot_config

Conflicts:
	test/recordings/cli.site.slot-tests.nock.js