2018-03-13 - releng
09:46	<hashar>	integration: cherry pick PS3 of https://gerrit.wikimedia.org/r/#/c/412894/ | T188112	[releng]