2014-04-09 - releng
21:39	<bd808>	Cherry-picked I8f77e0c into puppet and forced puppet run on deployment-bastion	[releng]