2020-12-17 - releng
18:11	<dpifke>	Fixing some merge conflicts in beta puppet (so that upstream can sync again).	[releng]