rose edit: fix upgrade messages for null or generic settings
#1268: add more default metadata
Merge pull request #1388 from benfitzpatrick/1268.add-more-default-metadata

Add more default metadata
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
rosie.ws_client: support multiple sources

And refactor.