2015-06-11 - releng
14:30	<hashar>	rebasing puppetmaster on integration-puppetmaster ca27502..c409503	[releng]