2014-09-28 - releng
14:38	<andrewbogott>	cherry-picked https://gerrit.wikimedia.org/r/#/c/163464/ onto deployment-salt to fix a puppet compile failure.	[releng]