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

Conflicts:
	src/mapserver/qgswmsserver.cpp
Add tooltip to map unit scale edit button
Improve map unit scale dialog title and add descriptive
Enable disabled simplification code after merge MTR (1-2)

Disable simplification of geometries in composer by default
Enable disabled simplification code after merge MTR (2-2)

Enable AntialiasingSimplification
#9480: New 'pointOnSurface' method for QgsGeometry
#9480: New option for CentroidFillSymbolLayerV2 to force centroid inside of polygons
#9480: Force label position inside of polygons in PAL labeling library
#9480: Add /Factory/ to pointOnSurface() method
#9480: Add GUI checkbox option in labeling
#9480: Add centroidInside to sip file
Fix #10366 (geometry functions not working in rule test)
Fix atlas signal emitting
[layertree] Added QgsLayerTreeModel doxygen docs + minor API changes
[layertree] Fix #10373 (embedded group not loaded if with relative path)
[layertree] Use writePath() for embedded groups (absolute vs relative path)
[layertree] Doxygen docs for QgsLayerTreeView
Better implementation of 20015e72
Fix #10345
Fix add features dialog
Fix #10362