2016-11-28 - releng
09:15	<elukey>	cherry-pick of https://gerrit.wikimedia.org/r/#/c/323517 to deployment-puppetmaster02 to test	[releng]