Merge branch '11.5.1-release' into SHS-5905--social-block #1007

Job	Run time
lint_theme	36s
set_sites	59s
test_phpunit	1m 42s
test_new_site	12m 20s
test_existing_site (aaai)	5m 30s
test_existing_site (archaeology)	8m 35s
test_existing_site (art)	7m 51s
test_existing_site (culture_emotion_lab)	5m 43s
test_existing_site (english)	9m 38s
test_existing_site (gavin_wright__humsci)	5m 6s
test_existing_site (hs_fcp)	5m 30s
test_existing_site (hsweb_userguide)	5m 56s
test_existing_site (internationalrelations)	8m 40s
test_existing_site (sgs)	9m 9s
deploy_branch	1m 47s
	1h 29m 2s

Provide feedback