Automatic merge from branch-4.5

* origin/branch-4.5:
  SONAR-5874 Support deprecated org.sonar.api.rules.RuleRepository when extending rules of org.sonar.api.server.rule.RulesDefinition

diff --cc server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java
Simple merge