Merge pull request #1137 from richardcloudsoft/brooklynnode-more-fixes

BrooklynNode - more fixes