2015-07-06 - releng
21:32	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/223184/ to deployment-salt	[releng]