Automatic merge from branch-5.1

* origin/branch-5.1:
  SONAR-6296 Display dashboard name from bundle if available

diff --cc server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
index 21807504e757be8d1a5f29079a2ed79c6cce1fb5,a4dea17791829957eeb65a529687cbfdf12c1356..f319ce21e65683e6ff21365dc92e55930282a133
--- 1/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
--- 2/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/dashboard/_header.html.erb
@@@ -1,8 -1,8 +1,8 @@@
  <header class="page-header">
-   <h1 class="page-title"><%= h @dashboard.name -%></h1>
+   <h1 class="page-title"><%= h @dashboard.name(true) -%></h1>
  
  
 -  <div class="page-actions operations noprint">
 +  <div class="page-actions noprint">
      <% if @snapshot %>
        <% if @snapshot.project_snapshot.periods? %>
          <% period_options = period_select_option_tags(@snapshot, 'small') %>