Fixed bug where proxy for room watchers could be "lost" due to new proxy
being created before old proxy was returned.
Merge branch 'master' of ssh://core.linn.co.uk/home/git/ohTopology
Updated to latest ohOs
Fixed unit test.