Merge "Wait for available rollbacks in RollbackTest."