2018-07-03 - releng
21:48	<Krenair>	cleaned up cherry-pick conflict to try to fix puppet	[releng]