fix rollback in the case where we encounter a bad fileop (like rename)
after we have passed lastGTID but before lastGTIDAfterSnapshot.
Also fix some test failures