Switch configure to use puppet-git-reapply
Merge branch 'upstream'