Revert "GEOS5672: fixed nested group loop" to fix the build

This reverts commit 03c5c87de570337a27238a5c4bb44a232752a237.
Merge branch 'master' of git://github.com/geoserver/geoserver