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
VectorLayer, SymbolsList, WidgetShapeburst, XML, parent
QgsComposition::addItemsFromXML for python (without optional arguments). Funded by Sourcepole QGIS Enterprise.
Don't draw annotation text outside of painter's clip region (fix #10400)
Allow choice of files with non .html extension for HTML annotation
QgsFieldModel use attributeDisplayName (fix #10451)
Reintroduce datum transforms (were disabled during transition to MTR)
Fix ellipse marker dxf export
QGIS Server - new project option imageQuality used for JPEG images

* JPEG image quality parameter in OWS / WMS capabilities of the Project properties dialog
* this parameter is only used for jpeg images
* a new parameter IMAGE_QUALITY can be used in the getMap request and will override the project value
Fix outline color in simple marker dxf export
Merge pull request #1403 from mdouchin/getmap_image_quality

QGIS Server - new project option imageQuality used for JPEG images
german translation update
GUI Translation update ja