Merge "Bug 1225: Fixed bug in registration of default RPC implementation."