Merge "Don't set job var override_checkout if null" into feature/zuulv3