Merge remote-tracking branch 'upstream/master'

Conflicts:
	sonar-cxx-plugin/src/main/resources/com/sonar/sqale/cxx-model-project.xml
	sonar-cxx-plugin/src/main/resources/com/sonar/sqale/cxx-model.xml