2016-09-01 - releng
18:32	<urandom>	T130861: Cherry picking https://gerrit.wikimedia.org/r/#/c/282466/ to deployment-puppetmaster	[releng]