Made netgroup support more generic
Merge branch 'netgroup-support' into surfsara-master