fix error where apidoc breaks due to error in UsageApi
Fix name of machine mutex in installJava() method and update to use DynamicTasks
Merge pull request #1054 from grkvlt/fix/install-java-mutex

Fix name of machine mutex in installJava() method
Merge pull request #1052 from ahgittin/fix/apidoc

fix error where apidoc breaks due to error in UsageApi
Aggregate ports across entire child sub-tree for SameServerEntity not just immediate children
Merge pull request #1056 from grkvlt/fix/same-server-entity-ports

Aggregate ports across entire child sub-tree for SameServerEntity
Merge branch 'master' of https://github.com/brooklyncentral/brooklyn into fix/same-server-entity-ports

* 'master' of https://github.com/brooklyncentral/brooklyn:
  Aggregate ports across entire child sub-tree for SameServerEntity not just immediate children
  Fix name of machine mutex in installJava() method and update to use DynamicTasks
  fix error where apidoc breaks due to error in UsageApi

Conflicts:
	core/src/main/java/brooklyn/entity/basic/SameServerEntityImpl.java