Misc fixes for the git migration

@davidlt The cms-git-tools fix is critical and we should not do pre8 without it. I'm building it now for testing.