Refactor rebind code, and tidy

Please merge https://github.com/apache/incubator-brooklyn/pull/308 first
I'd be inclined to deprecate this version too, but no strong feelings. How common is the "common call"?