Merge branch 'stable-2.16'

* stable-2.16:
  Set SSH default port to 22

Change-Id: Ib913a2dac90602e54bd49112093b1842edfb74f7

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 0c1b331..d229a68 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(":");