Manual merge from branch-5.1

diff --cc server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index a3e02ea1211a710dd2dcdaa19b171887da37af1b,ea847c6e0959e33568f22d737aa6ef1e67bdc682..87a8e607fae1f98da2b010b7510ecf804bd89ec1
--- 1/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@@ -61,9 -64,7 +61,8 @@@ import org.sonar.server.view.index.View
  import javax.annotation.CheckForNull;
  import javax.annotation.Nullable;
  
- import java.text.SimpleDateFormat;
  import java.util.*;
 +import java.util.regex.Pattern;
  
  import static com.google.common.collect.Lists.newArrayList;
  

diff --cc server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java
Simple merge