rose edit: fix upgrade messages for null or generic settings
add tests & fix sort
Merge pull request #1381 from benfitzpatrick/rose-edit.fix-macro-upgrade-problems

rose edit: fix macro report handling for null or generic settings