Hack octocatalog-diff script to support puppet 7
This applies the puppet 7 Puppetfile changes to both source and target branch before running octocatalog-diff.
While debugging this, I noticed that we hadn't updated the gitconfig used to override remote clones with local clones, so fix that (and add the missing puppet-kmod to the mrconfig).