Merge "Replace pauses in rollback tests w/ dynamic waits"