Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set SSH default port to 22

Change-Id: I7fa99711a5938542eae97858ddc3b998efd3a374

src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
index e775d95..26177f1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/download/scheme/SshScheme.java
@@ -53,7 +53,7 @@
       }
     }
 
-    int port = 29418;
+    int port = 22;
     String host = sshAddr;
     if (sshAddr != null) {
       int p = sshAddr.indexOf(":");