Merge remote-tracking branch 'origin/branch-5.2'

diff --cc server/sonar-web/src/main/js/components/source-viewer/main.js
Simple merge

diff --cc server/sonar-web/src/main/js/components/source-viewer/measures-overlay.js
Simple merge

diff --cc server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
index 1f712bdf4bea04d273a13a0bc96d9e98cda342c7,62259771af10cb6d98491dd0455aad380a71c0e6..f731b6c0ab428e0d06c5d23e148c94eb812e5fb4
--- 1/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
--- 2/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/popups/coverage-popup.js
@@@ -1,14 -1,14 +1,14 @@@
  import $ from 'jquery';
  import _ from 'underscore';
 -import Popup from 'components/common/popup';
 -import Workspace from 'components/workspace/main';
 -import '../templates';
 +import Popup from '../../common/popup';
 +import Workspace from '../../workspace/main';
 +import Template from '../templates/source-viewer-coverage-popup.hbs';
  
  export default Popup.extend({
 -  template: Templates['source-viewer-coverage-popup'],
 +  template: Template,
  
    events: {
-     'click a[data-uuid]': 'goToFile'
+     'click a[data-id]': 'goToFile'
    },
  
    onRender: function () {
@@@ -18,8 -18,9 +18,8 @@@
  
    goToFile: function (e) {
      e.stopPropagation();
-     var uuid = $(e.currentTarget).data('uuid');
-     Workspace.openComponent({ uuid: uuid });
+     var id = $(e.currentTarget).data('id');
 -    var RealWorkspace = Workspace.openComponent ? Workspace : require('components/workspace/main');
 -    RealWorkspace.openComponent({ uuid: id });
++    Workspace.openComponent({ uuid: id });
    },
  
    serializeData: function () {