River Refactoring, some minor refactoring to junit tests. Some minor refactoring of LookupDiscoveryManager's internal class ProxyReg