Merge "Optimize HashRing to avoid hashing for the common single-location case"