2017-05-24 - releng
10:19	<hashar>	deployment-prep rebased puppet repo with: git rebase -X theirs	[releng]