Automatic merge from branch-5.3

* origin/branch-5.3:
  open file in the workspace when click on the bubble
  SONAR-7126 Scanner on Java 7 must support TLS 1.2 when connecting to SonarQube HTTPS server
  Add unit test for Java CPD Engine

diff --cc server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
index eab0fdb9e0c5b9fc92f9389e35dc6b75b6c27b79,fdad62039c1905b79be29ca0e32a352eed2d081b..b85e5c7adbb77e0b0b1a95ce443e72f8d35ec3ca
--- 1/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
--- 2/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
@@@ -366,8 -366,8 +366,9 @@@ class Api::ResourcesController < Api::A
  
      json = {
        'id' => resource.id,
 +      'uuid' => resource.uuid,
        'key' => resource.key,
+       'uuid' => resource.uuid,
        'name' => resource.name,
        'scope' => resource.scope,
        'qualifier' => resource.qualifier,