Merge "Add jobs back to .zuul.yaml" into feature/zuulv3