Automatic merge from master

* origin/master:
  Improve assertions in server benchmarks
  update shortcuts help labels
  Fix compatibility of tests with Oracle

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