Update to brooklyn 0.6.0-snapshot

Builds on https://github.com/cloudsoft/brooklyn-social-apps/pull/15, so please review + merge that first.

Requires more testing (of the catalog annotation stuff), but wanted to submit this PR to avoid risk of someone else duplicating the work!