2016-02-10 - releng
21:22	<legoktm>	cherry-picking https://gerrit.wikimedia.org/r/#/c/269370/ on integration-puppetmaster again	[releng]