Merge "Fix create_branch in tests" into feature/zuulv3