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

Conflicts:
	src/mapserver/qgswmsserver.cpp
Inverted renderer: make sure it works when no painter is here (feature count)
Inverted polygon renderer: add an option to preprocess polygons using an union
Inverted polygon renderer: make sure the each symbol category is always rendered in the same order
Inverted polygon renderer: fix rendering when projection is enabled
Inverted polygon renderer: add test for projected and merged
Inverted polygon renderer: update SIP
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.
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