Automatic merge from branch-6.5

* origin/branch-6.5:
  SONAR-9403 Display project activity custom graphs on the project dashboard too
  SONAR-9403 Fix metric translation for plugins metrics on project activity page

diff --cc server/sonar-web/src/main/js/apps/overview/events/PreviewGraph.js
Simple merge

diff --cc server/sonar-web/src/main/js/apps/projectActivity/components/forms/AddGraphMetric.js
Simple merge