2020-09-04 - releng
18:05	<dpifke>	Rebasing and re-cherry-picking some patches in beta puppet to fix merge conflicts.	[releng]