Merge branch 'develop' into 11.6.1-release #1155

Job	Run time
set_sites	55s
test_phpunit	1m 41s
lint_theme	41s
test_new_site	12m 38s
test_existing_site (bsurp)	5m 37s
test_existing_site (buddhiststudies)	7m 46s
test_existing_site (default)	5m 51s
test_existing_site (finance_humsci)	6m 22s
test_existing_site (mrc)	6m 56s
test_existing_site (oconnell)	6m 18s
test_existing_site (religiousstudies)	7m 45s
test_existing_site (sgs)	9m 51s
test_existing_site (sitp)	9m 24s
test_existing_site (sociology)	8m 11s
deploy_branch	1m 47s
	1h 31m 43s

Provide feedback