Merge "Bug 2415: Fixed intermittent RpcRegistry unit test failures"