brooklyncentral/brooklyn — pull request #1142 by richardcloudsoft (2014-01-09 16:14:17+00:00)
Title: BrooklynNode fixes forwardport

Cherry-picks commits from PRs #1119 and #1137 on 0.6.x branch to master