2015-07-03 - releng
14:03	<hashar>	rebased puppetmaster on integration project	[releng]