Merge branch 'master' into feature/branding

diff --cc sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java
Simple merge

diff --cc sonar-core/src/main/resources/org/sonar/l10n/core.properties
Simple merge

diff --cc sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
Simple merge