Merge "Migrate node information to nodeset instead of nodes" into feature/zuulv3