Merge "Add more information on variables in jobs" into feature/zuulv3