nest nodegroup match in nodegroups file
Revert "nest nodegroup match in nodegroups file"

This reverts commit 265c96d9cb635ba570e7e08364fa1ffcc754f22c.
nest nodegroup match
Merge pull request #13587 from allanhung/develop

nest nodegroup match in nodegroups file