This closes 177.

Merge remote-tracking branch 'apache-gh/pr/177' into pr-177-2

Conflicts - quite a few places, where CatalogItem was added in master but not done here.  Have fixed that and other things noted in the pull request.

	core/src/main/java/brooklyn/entity/rebind/RebindManagerImpl.java
	core/src/main/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterToObjectStore.java