Merge "Create job-output.txt together with JobDir" into feature/zuulv3