Merge branch 'master' into branch-3.7

Merge branch 'master' into branch-3.7

Conflicts:
	plugins/sonar-core-plugin/pom.xml
	plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/notification/NewIssuesEmailTemplateTest.java
	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-maven-batch-plugin/pom.xml
	pom.xml
	sonar-application/pom.xml
	sonar-batch-maven-compat/pom.xml
	sonar-batch/pom.xml
	sonar-channel/pom.xml
	sonar-check-api/pom.xml
	sonar-colorizer/pom.xml
	sonar-core/pom.xml
	sonar-core/src/main/java/org/sonar/core/issue/IssueNotifications.java
	sonar-core/src/main/java/org/sonar/core/issue/IssueUpdater.java
	sonar-core/src/test/java/org/sonar/core/issue/IssueNotificationsTest.java
	sonar-core/src/test/java/org/sonar/core/issue/IssueUpdaterTest.java
	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/main/java/org/sonar/api/issue/IssueQuery.java
	sonar-server/pom.xml
	sonar-server/src/main/java/org/sonar/server/db/migrations/ConvertViolationsToIssues.java
	sonar-squid/pom.xml
	sonar-testing-harness/pom.xml
	sonar-ws-client/pom.xml