2018-03-13 - releng
09:50	<hashar>	integration: cherry pick https://gerrit.wikimedia.org/r/#/c/419131/1 | T188112	[releng]