2016-06-23 - releng
08:55	<hashar>	integration: rebased puppet master by dropping a conflicting/obsolete patch	[releng]