2016-10-13 - releng
16:03	<gilles>	Cherry-picking https://gerrit.wikimedia.org/r/#/c/315648/ on deployment-puppetmaster	[releng]