2020-07-30 - releng
20:45	<dpifke>	Fixed merge conflicts in beta puppetmaster.	[releng]