Merge "bug 44136: Don't rollback after successful commit"