Ported WMSGetFeatureInfo fixes from master