rose app-upgrade: fix HEAD broken macro pathway
Merge pull request #1200 from benfitzpatrick/rose-app-upgrade.broken-pathway-HEAD-fix-tests

rose app-upgrade: fix HEAD broken macro pathway