Merge remote-tracking branch 'origin/branch-5.0'

diff --cc plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/XooPluginTest.java
Simple merge

diff --cc plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/rule/XooRulesDefinitionTest.java
Simple merge

diff --cc sonar-batch/src/main/java/org/sonar/batch/rule/ActiveRulesProvider.java
Simple merge

diff --cc sonar-plugin-api/src/test/java/org/sonar/api/batch/rule/CheckFactoryTest.java
Simple merge