Merge "Bug 2526: Race condition may cause missing routes in RPC BucketStore"