2019-09-11 - production
16:36	<bblack>	ran conftool-merge on puppetmaster1001 (manually from sudo -i, to fixup missing updates)	[production]