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

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
	sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java

diff --cc server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index 968c9b4644879ca5a4e90069ffd0615aa3ea687d,2a393da1818dc2da2bf55935bd42b95fafc61eeb..c008bd971d042f323a58df5b67db0c978ac3083c
--- 1/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@@ -48,22 -43,12 +48,21 @@@ import org.sonar.api.server.debt.DebtCh
  import org.sonar.core.rule.RuleDto;
  import org.sonar.server.qualityprofile.index.ActiveRuleNormalizer;
  import org.sonar.server.rule.Rule;
 -import org.sonar.server.search.*;
 +import org.sonar.server.search.BaseIndex;
 +import org.sonar.server.search.IndexDefinition;
 +import org.sonar.server.search.IndexField;
 +import org.sonar.server.search.QueryContext;
 +import org.sonar.server.search.Result;
 +import org.sonar.server.search.SearchClient;
  
  import javax.annotation.CheckForNull;
--
 -import java.io.IOException;
 -import java.util.*;
 +import java.util.ArrayList;
 +import java.util.Collection;
 +import java.util.HashMap;
 +import java.util.HashSet;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Set;
  
  import static com.google.common.collect.Lists.newArrayList;
  

diff --cc server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
Simple merge

diff --cc sonar-application/src/main/assembly/conf/sonar.properties
Simple merge

diff --cc sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
Simple merge

diff --cc sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java
index 8b268b14be94558cbeeedf1941f503bfb60115f1,8805ac83d890ddc3f88c32dbd4869df6766802c1..3ea69cad78152f95213f0c54e4dc8e2e641e3a48
--- 1/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java
--- 2/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan2/DefaultFileLinesContextFactory.java
@@@ -20,10 -20,8 +20,9 @@@
  package org.sonar.batch.scan2;
  
  import org.sonar.api.batch.bootstrap.ProjectDefinition;
- import org.sonar.api.batch.fs.FileSystem;
  import org.sonar.api.batch.fs.InputFile;
  import org.sonar.api.batch.measure.MetricFinder;
 +import org.sonar.api.batch.sensor.SensorStorage;
  import org.sonar.api.measures.FileLinesContext;
  import org.sonar.api.measures.FileLinesContextFactory;
  import org.sonar.api.resources.Resource;
@@@ -31,12 -29,12 +30,12 @@@ import org.sonar.batch.scan.filesystem.
  
  public class DefaultFileLinesContextFactory implements FileLinesContextFactory {
  
 -  private final AnalyzerMeasureCache measureCache;
 +  private final SensorStorage sensorStorage;
    private final MetricFinder metricFinder;
    private final ProjectDefinition def;
 -  private InputPathCache fileCache;
 +  private final InputPathCache fileCache;
  
-   public DefaultFileLinesContextFactory(InputPathCache fileCache, FileSystem fs, MetricFinder metricFinder, SensorStorage sensorStorage,
 -  public DefaultFileLinesContextFactory(InputPathCache fileCache, MetricFinder metricFinder, AnalyzerMeasureCache measureCache,
++  public DefaultFileLinesContextFactory(InputPathCache fileCache, MetricFinder metricFinder, SensorStorage sensorStorage,
      ProjectDefinition def) {
      this.fileCache = fileCache;
      this.metricFinder = metricFinder;