2015-06-11 - releng
14:28	<hashar>	rebasing puppetmaster on deployment-salt ca27502..c409503	[releng]