2018-04-06 - releng
21:50	<eddiegp>	beta: Cherry-picking https://gerrit.wikimedia.org/r/c/424707/ , test for T173887	[releng]