2015-06-02 - releng
20:41	<marxarelli>	cherry-picked https://gerrit.wikimedia.org/r/#/c/208024/ on integration-puppetmaster	[releng]