2016-04-05 - releng
21:53	<marxarelli>	Cherry picked https://gerrit.wikimedia.org/r/#/c/281706/ on integration-puppetmaster and applying on integration-slave-trusty-1014	[releng]