2016-02-17 - releng
18:59	<jzerebecki>	updating chery-pick https://gerrit.wikimedia.org/r/#/c/204528/15 on integration-puppetmaster T126699	[releng]