Fix failing rebind tests (0.6.x)

Cherry-picked from https://github.com/brooklyncentral/brooklyn/pull/1010