Automatic merge from master

* origin/master:
  Fix compatibility of tests with non-H2 dbs
  SONAR-6229 Indexing of activity logs consumes too much memory during server startup
  SONAR-6233 fix characteristic facet on rules page
  SONAR-6233 Fix behavior of facet on uncharacterized rules
  SONAR-6238 Updating only the name of a rule is not taking in account when synchronizing rules at startup
  Update javadoc
  Rename method
  Add javadoc
  change "recent history" to "browsed recently"

diff --cc server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
index 1b67325466a6ca8f286e82e8a8754ae050c0399f,42a4ad0f0a3137c935a1886d30704c0b352853f2..32eec19eb53c9a93af5854388288210c5503ee39
--- 1/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileService.java
@@@ -230,9 -219,9 +219,9 @@@ public class QProfileService implement
          RuleDto ruleDto = db.ruleDao().getNullableByKey(session, profileActivity.ruleKey());
          profileActivity.ruleName(ruleDto != null ? ruleDto.getName() : null);
  
-         String login = profileActivity.login();
+         String login = profileActivity.getLogin();
          if (login != null) {
 -          UserDto user = db.userDao().selectActiveUserByLogin(login, session);
 +          UserDto user = db.userDao().selectActiveUserByLogin(session, login);
            profileActivity.authorName(user != null ? user.getName() : null);
          }
          result.getHits().add(profileActivity);

diff --cc server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
Simple merge

diff --cc sonar-core/src/main/resources/org/sonar/l10n/core.properties
Simple merge