Merge "Improve debugging at start of job" into feature/zuulv3