2015-03-20 - releng
08:36	<mobrovac>	deployment-salt ops/puppet: cherry-picking I48b1a139b02845c94c85cd231e54da67c62512c9	[releng]