[GEOS-6604] WMS GetFeatureInfo using 'vendorParams: propertyName' does not working after upgrade to 2.5.x
Merge branch 'master' of git://github.com/geoserver/geoserver