Merge "Run the new fancy zuul-jobs versions of jobs" into feature/zuulv3