Draft: Merge branch puppet-7 into master

We upgraded to Puppet 7 using a different branch and never merged it back to master.

Let's see what's needed to finally do that!