BrooklynNode fixes forwardport

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