2015-04-20 - releng
16:04	<hashar>	beta: manually rebasing operations/puppet on deployment-salt . Might have killed some live hack in the process :/	[releng]