2016-09-27 - releng
16:29	<anomie>	Cherry-picked https://gerrit.wikimedia.org/r/#/c/313035/ on deployment-puppetmaster	[releng]