2016-02-17 - releng
18:11	<jzerebecki>	updated cherry-pick https://gerrit.wikimedia.org/r/#/c/204528/14 on integration-puppetmaster T126699	[releng]