2018-07-03 - releng
22:11	<Krenair>	rebased stuff on deployment-puppetmaster and ran puppet everywhere through cumin	[releng]