Merge "Bug 2486: Get testAbortBeforeFinishCommit working again"