Bug 4866: Add wait/retries for routed RPCs