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

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryLoader.java
	server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryLoaderMediumTest.java
	server/sonar-server/src/test/java/org/sonar/server/rule/RuleTesting.java
	sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
	sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesMediumTest.java
	sonar-batch/src/test/java/org/sonar/batch/mediumtest/issues/IssuesOnDirMediumTest.java

1 files changed, 1 insertions, 1 deletions

diff --git a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
index ab6e6c64192..219f8a536ea 100644
--- a/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
+++ b/sonar-batch-protocol/src/main/java/org/sonar/batch/protocol/input/ActiveRule.java
@@ -31,7 +31,7 @@ public class ActiveRule {
   private final Map<String, String> params = new HashMap<String, String>();
 
   public ActiveRule(String repositoryKey, String ruleKey, @Nullable String templateRuleKey, String name, @Nullable String severity,
-    @Nullable String internalKey, @Nullable String language) {
+                    @Nullable String internalKey, @Nullable String language) {
     this.repositoryKey = repositoryKey;
     this.ruleKey = ruleKey;
     this.templateRuleKey = templateRuleKey;