2018-04-13 - releng
16:55	<eddiegp>	cherry-pick https://gerrit.wikimedia.org/r/#/c/426104/ (test 3)	[releng]