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

diff --cc server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
index ddb1c63444bdb5191d5ca8f8a5f476f50d384c49,b2333685896ecef3a211a6aec1ee8a42ba4f6f4f..0b1204ce2cbf78d8cf76818f2fa0f5dcd925792c
--- 1/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WsResponseCommonFormat.java
@@@ -22,8 -22,7 +22,7 @@@ package org.sonar.server.ws
  import org.sonar.api.resources.Language;
  import org.sonar.api.resources.Languages;
  import org.sonar.api.utils.Paging;
 -import org.sonar.db.rule.RuleDto;
 +import org.sonar.db.rule.RuleDefinitionDto;
- import org.sonar.db.user.UserDto;
  import org.sonarqube.ws.Common;
  
  import static com.google.common.base.Strings.nullToEmpty;

diff --cc server/sonar-web/src/main/js/components/issue/templates/issue.hbs
Simple merge

diff --cc sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/filesystem/InputFileBuilder.java
Simple merge