Merge "Define the internal noop job" into feature/zuulv3