Mapserver: fixed inconsistencies int WMS GetFeatureInfo response
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mapserver/qgswmsserver.cpp
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
mapserver: added 'alias' property into feature attribute properties of GetProjectSettings response
mapserver: excluding of not allowed WMS feature attributes from GetFeatureInfo response in GML format
Merge pull request #1419 from marcel-dancak/master

Mapserver's GetProjectSettings/GetFeatureInfo bug-fixes