some more tidying following emergency fix in https://github.com/apache/incubator-brooklyn/commit/bf627f76a7ad959a3beb7095e409a90e4cfa6e06