2016-07-26 - releng
11:37	<hashar>	rebased integration puppetmaster git repo	[releng]