Merge "Fix missing mutex release when aborting builds" into feature/zuulv3