From: ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Date: Fri, 8 Dec 2017 07:01:09 +0000 (+0100)
Subject: Automatic merge from branch-6.7
X-Git-Tag: 7.0-RC1~172
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=02b26f90186b0763622af2e1138c64f2bd61fff3;p=sonarqube.git

Automatic merge from branch-6.7

* origin/branch-6.7:
  Revert "SONAR-10176 Fix query of users having a global permission"
  SONAR-10176 Fix query of users having a global permission
  SONAR-10123 UserSession#keepkeepAuthorizedComponents handles branches properly
---

02b26f90186b0763622af2e1138c64f2bd61fff3