2016-12-08 - releng
05:26	<legoktm>	cherry-picked https://gerrit.wikimedia.org/r/#/c/325877/ onto integration-puppetmaster01	[releng]