[GEOS-6122] WFS GeoJSON output format strips z from 3d data
Merge branch '2.3.x' of git://github.com/geoserver/geoserver into 2.3.x