Merge "Fix nodeset return on skipped jobs" into feature/zuulv3