Merge "Use zuul attributes in nodeset section" into feature/zuulv3