2016-02-09 - releng
21:52	<legoktm>	cherry-picked https://gerrit.wikimedia.org/r/#/c/269370/ onto integration-puppetmaster	[releng]