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

Conflicts:
	server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java

diff --cc server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java
index a35754bd74fdca4612a08a504742816e88bd03d5,4012a7321b93c2cdbde4cafbcdc1294dc5902381..7c0e5da8d471be72deb83cbcc8433a0ad479ad63
--- 1/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/db/migrations/v451/AddMissingCustomRuleParametersMigration.java
@@@ -92,27 -125,6 +109,29 @@@ public class AddMissingCustomRuleParame
      }
    }
  
-     Multimap<Integer, Integer> customRuleIdsByTemplateRuleId,
-     Multimap<Integer, RuleParameter> customRuleParamsByRuleId,
-     DbSession session) {
 +  private void insertCustomRuleParameterIfNotAlreadyExisting(RuleParameter templateRuleParam, Integer templateRuleId,
-           .setRuleId(customRuleId)
-           .setRuleTemplateId(templateRuleId)
-           .setName(templateRuleParam.getName())
-           .setDescription(templateRuleParam.getDescription())
-           .setType(templateRuleParam.getType())
-           );
++                                                             Multimap<Integer, Integer> customRuleIdsByTemplateRuleId,
++                                                             Multimap<Integer, RuleParameter> customRuleParamsByRuleId,
++                                                             DbSession session) {
 +    for (Integer customRuleId : customRuleIdsByTemplateRuleId.get(templateRuleId)) {
 +      if (!hasParameter(templateRuleParam.getName(), customRuleParamsByRuleId.get(customRuleId))) {
 +        // Insert new custom rule parameter
 +        session.getMapper(Migration45Mapper.class).insertRuleParameter(new RuleParameter()
++            .setRuleId(customRuleId)
++            .setRuleTemplateId(templateRuleId)
++            .setName(templateRuleParam.getName())
++            .setDescription(templateRuleParam.getDescription())
++            .setType(templateRuleParam.getType())
++        );
 +
 +        // Update updated at date of custom rule in order to allow E/S indexation
 +        session.getMapper(Migration45Mapper.class).updateRuleUpdateAt(customRuleId, new Date(system.now()));
++
++        counter.getAndIncrement();
 +      }
 +    }
 +  }
 +
    private boolean hasParameter(final String parameter, Collection<RuleParameter> customRuleParams) {
      return Iterables.any(customRuleParams, new Predicate<RuleParameter>() {
        @Override