Merge "Add support for defining groups in nodesets" into feature/zuulv3