Merge "Fix test to return PrimaryShardInfo when retrieving primary shard" into stable...