Merge "Add support for override-checkout, deprecate override-branch" into feature/zuulv3