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
Merge pull request #999 from benfitzpatrick/941.post-upgrade-trigger-fix

#941: apply trigger fixing after app-upgrade