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
GUI Translation update ja
Replace deprecated QRexExp API

Qt 4.6 saw QRegExp::numCaptures() change to QRegExp::captureCount().
Replace deprecated API
Merge pull request #1427 from simonsonc/qgscolorbutton-deprecated-api

Replace deprecated API
fix #10405 and #10303 partially: removes the scroll area for the style page
Fix crash when QgsDatumTransformStore::transformation returns 0

Simply fix to prevent crash if QgsDatumTransformStore::transformation returns 0. Works for me but has not been further tested!
Merge pull request #1426 from simonsonc/qgsvaluemapconfigdlg-deprecated-api

Replace deprecated QRexExp API
Merge pull request #1429 from christianurich/QgsDatumTransformStore_transformation_0

Fix crash when QgsDatumTransformStore::transformation returns 0
FieldExpressionWidget: add tooltip if expression is larger than widget
remove useless argument
fix 10303: limit expression widget width in data defined properties