[GEOS-6725] JSON totalFeatures does not account for viewparams
Merge remote-tracking branch 'upstream/master'