2017-10-11 - releng
18:19	<hashar>	beta: rebased puppet master due to a conflict with b3c6968b3c	[releng]