Merge "bug 5096 Clean up transaction in case of failure"