Merge "Bug 2194: Find primary shard on remote ShardManager"