2017-04-04 - releng
20:58	<hashar>	rebased integration puppet master	[releng]