Merge "Do not allow multiple commits of the same rollback."