Merge #1002 into master

Merging changes made in 0.6.x branch, into master (for 0.7.0-snapshot). See https://github.com/brooklyncentral/brooklyn/pull/1002