2017-06-07 - releng
17:30	<elukey>	manually fixed rebase issue for operations/puppet on puppetmaster02 (empty commit due to the change for scap3 and jobrunners)	[releng]