Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	plugins/sonar-core-plugin/pom.xml
	plugins/sonar-cpd-plugin/pom.xml
	plugins/sonar-dbcleaner-plugin/pom.xml
	plugins/sonar-design-plugin/pom.xml
	plugins/sonar-email-notifications-plugin/pom.xml
	plugins/sonar-l10n-en-plugin/pom.xml
	plugins/sonar-xoo-plugin/pom.xml
	pom.xml
	server/pom.xml
	server/sonar-process-monitor/pom.xml
	server/sonar-process/pom.xml
	server/sonar-search/pom.xml
	server/sonar-server/pom.xml
	server/sonar-web/pom.xml
	server/sonar-ws-client/pom.xml
	sonar-application/pom.xml
	sonar-batch-maven-compat/pom.xml
	sonar-batch-protocol/pom.xml
	sonar-batch/pom.xml
	sonar-check-api/pom.xml
	sonar-colorizer/pom.xml
	sonar-core/pom.xml
	sonar-deprecated/pom.xml
	sonar-duplications/pom.xml
	sonar-graph/pom.xml
	sonar-home/pom.xml
	sonar-java-api/pom.xml
	sonar-markdown/pom.xml
	sonar-maven-plugin/pom.xml
	sonar-maven3-plugin/pom.xml
	sonar-plugin-api/pom.xml
	sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
	sonar-testing-harness/pom.xml

diff --cc plugins/sonar-core-plugin/pom.xml
Simple merge

diff --cc plugins/sonar-cpd-plugin/pom.xml
Simple merge

diff --cc plugins/sonar-dbcleaner-plugin/pom.xml
Simple merge

diff --cc plugins/sonar-l10n-en-plugin/pom.xml
Simple merge

diff --cc pom.xml
Simple merge

diff --cc server/sonar-process-monitor/pom.xml
Simple merge

diff --cc server/sonar-process/pom.xml
Simple merge

diff --cc server/sonar-search/pom.xml
Simple merge

diff --cc server/sonar-server/pom.xml
Simple merge

diff --cc server/sonar-web/pom.xml
Simple merge

diff --cc server/sonar-ws-client/pom.xml
Simple merge

diff --cc sonar-application/pom.xml
Simple merge

diff --cc sonar-batch-protocol/pom.xml
Simple merge

diff --cc sonar-batch/pom.xml
Simple merge

diff --cc sonar-check-api/pom.xml
Simple merge

diff --cc sonar-duplications/pom.xml
Simple merge

diff --cc sonar-graph/pom.xml
Simple merge

diff --cc sonar-java-api/pom.xml
Simple merge

diff --cc sonar-markdown/pom.xml
Simple merge

diff --cc sonar-maven-plugin/pom.xml
Simple merge

diff --cc sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
Simple merge

diff --cc sonar-testing-harness/pom.xml
Simple merge