fixes for WMSGetFeatureInfo
Merge branch 'C013N' of github.com:geosolutions-it/mapstore into C013N