Merge "Add override-branch property to job repos" into feature/zuulv3