Merge "BUG-2510: Remove all registrations when a routed rpc is closed"