2020-08-10 - releng
22:56	<dpifke>	Cleaned up beta puppet to remove previously cherry-picked patches where are now merged.	[releng]