GEOS-6122, making json work also with full 3d srs
Merge branch '2.3.x' of git://github.com/geoserver/geoserver into 2.3.x