Merge "Bug 560: Fixed Mount Point RPC registration service"