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