Fixed failed master catch-up after rejoining cluster

Fix for fluky failures described here: https://trello.com/c/hcTvl0bv/393-check-and-potentially-fix-behaviour-of-instances-that-ungracefully-leave-the-cluster-and-rejoin-after-the-cluster-has-evicted-th