2015-01-16 - releng
23:26	<bd808>	cherry-picked https://gerrit.wikimedia.org/r/#/c/185570/ to fix puppet errors on deployment-prep	[releng]