metomi/rose#941: fix user-ignored trigger behaviour
metomi/rose#941: fix triggering for upgrades
metomi/rose#941: add post-upgrade trigger fixing in rose edit
metomi/rose#941: update
metomi/rose#941: rose macro: collapse code conditions
rose bush: display rose version
Merge pull request #999 from benfitzpatrick/941.post-upgrade-trigger-fix

#941: apply trigger fixing after app-upgrade
t/rose-suite-run/00: tweak to improve stability

It seems reload can sometimes cause the suite to hang. This change
should reduce the chance of that happening.
Merge pull request #1022 from matthewrmshin/tweak-t-rose-suite-run-00

t/rose-suite-run/00: tweak to improve stability
Merge pull request #1007 from matthewrmshin/rose-bush-rose-version

rose bush: display rose version