Amend last commit - enable SortByTest online only.
Merge branch 'master' of git://github.com/geoserver/geoserver