2017-10-05 - releng
10:56	<hashar>	integration: unbreak the puppet master. Was stuck do a cherry pick that needed a rebase	[releng]