2015-06-15 - releng
21:10	<bd808>	Put cherry-picks of https://gerrit.wikimedia.org/r/#/c/216325/ and https://gerrit.wikimedia.org/r/#/c/216337/ back on deployment-salt	[releng]