2015-03-20 - releng
12:32	<mobrovac>	deployment-salt ops/puppet: un-cherry-picked I48b1a139b02845c94c85cd231e54da67c62512c9	[releng]