Merge "Reduce HashRing test load to avoid several seconds of CPU"