[GEOS-6725] JSON totalFeatures does not account for viewparams
Merge branch 'master' of git://github.com/geoserver/geoserver