Merge "selenium: Add API wait and other pauses in rollback test"