Merge branch 'stable-2.7'

* stable-2.7:
  Propagate user access path from ssh scope in request scope

gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
index 64a1a42..0ae40a5 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java
@@ -82,7 +82,9 @@
     public CurrentUser getCurrentUser() {
       final CurrentUser user = session.getCurrentUser();
       if (user instanceof IdentifiedUser) {
-        return userFactory.create(((IdentifiedUser) user).getAccountId());
+        IdentifiedUser identifiedUser = userFactory.create(((IdentifiedUser) user).getAccountId());
+        identifiedUser.setAccessPath(user.getAccessPath());
+        return identifiedUser;
       }
       return user;
     }