rose macro, rose app-upgrade: fix relative opts.conf_dir
rose macro, rose app-upgrade: fix relative opts.output_dir
rose app-upgrade, rose macro: fix test-battery
rose app-upgrade: fix test-battery
Merge pull request #1186 from benfitzpatrick/rose-macro.fix-conf-dir-relative

rose app-upgrade, rose macro: fix relative opts.conf_dir