2015-07-07 - releng
20:48	<marxarelli>	cherry-picking https://gerrit.wikimedia.org/r/#/c/158016/ on deployment-salt	[releng]