Merge "Add timeout variable to jobs" into feature/zuulv3