Merge "Upgrade Jetty to 9.3.17.v20170317" into stable-2.14

gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
index 410ba3e..17ad4f6 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -558,7 +558,10 @@
       builder.setPort(Integer.parseInt(port));
     }
     String[] tokens = token.split("@", 2);
-    builder.setPath(tokens[0]);
+    if (Location.getPath().endsWith("/") && tokens[0].startsWith("/")) {
+      tokens[0] = tokens[0].substring(1);
+    }
+    builder.setPath(Location.getPath() + tokens[0]);
     if (tokens.length == 2) {
       builder.setHash(tokens[1]);
     }