2016-09-21 - releng
17:26	<yuvipanda>	cherry-pick https://gerrit.wikimedia.org/r/#/c/312044/ on deployment-puppetmaser	[releng]