Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  AdminConsoleCommandModule: Rename to SshModule
  AdminConsoleCommandModule: Remove redundant aliases

Change-Id: I8da546b907eff29a477e1fea3f0f08bc7e1af724

BUILD

diff --git a/BUILD b/BUILD
index 4201ec2..ea6778f 100644
--- a/BUILD
+++ b/BUILD
@@ -5,7 +5,7 @@
     srcs = glob(["src/main/java/**/*.java"]),
     manifest_entries = [
         "Gerrit-PluginName: admin-console",
-        "Gerrit-SshModule: com.googlesource.gerrit.plugins.adminconsole.AdminConsoleCommandModule",
+        "Gerrit-SshModule: com.googlesource.gerrit.plugins.adminconsole.SshModule",
         "Implementation-Title: Plugin admin-console",
         "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/admin-console",
     ],

src/main/java/com/googlesource/gerrit/plugins/adminconsole/SshModule.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/AdminConsoleCommandModule.java b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/SshModule.java
similarity index 74%
rename from src/main/java/com/googlesource/gerrit/plugins/adminconsole/AdminConsoleCommandModule.java
rename to src/main/java/com/googlesource/gerrit/plugins/adminconsole/SshModule.java
index c29da8f..fa73ecc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/adminconsole/AdminConsoleCommandModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/adminconsole/SshModule.java
@@ -16,15 +16,13 @@
 
 import com.google.gerrit.sshd.PluginCommandModule;
 
-public class AdminConsoleCommandModule extends PluginCommandModule {
+public class SshModule extends PluginCommandModule {
   @Override
   protected void configureCommands() {
     command(ShowAccountCommand.class);
     command(ListUsersCommand.class);
     command(GetFullPathCommand.class);
-    alias("show-account", ShowAccountCommand.class);
-    alias("show-repo-account-access", ShowRepoAccountAccessCommand.class);
-    alias("show-repo-access", ShowRepoAccessCommand.class);
-    alias("get-path", GetFullPathCommand.class);
+    command(ShowRepoAccountAccessCommand.class);
+    command(ShowRepoAccessCommand.class);
   }
 }