Merge the server failure rehash implementation