Automatic merge from master

* origin/master:
  SONAR-5945 close issues on deleted components
  Fix error margin of SourceDbBenchmarkTest
  Fix error margin of server benchmark
  Fix Javadoc and add useful method using Charset for RulesDefinitionXmlLoader

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