Feature/catalog annotation on entities

Builds on https://github.com/brooklyncentral/brooklyn/pull/516, so please review/merge that first and then I can rebase if required.