Merge branch 'master' into object-store-persistence

Conflicts:
	core/src/test/java/brooklyn/management/ha/HighAvailabilityManagerTestFixture.java
          -- new test added to master, integrated with method rename here and tested with refactoring