[GEOS-6338] GetFeatureInfo does not handle symbols whose size is expressed via UOM
Merge branch 'master' of github.com:geoserver/geoserver
Merge remote-tracking branch 'upstream/master'