Merge "Fix missing mutex release when aborting builds"