Bring back ZK short circuit optimization (even better this time) and fix a hang in blocking rejoin snapshots revealed by the timing changes