Upgrade master to use brooklyn 0.6.0-rc.2