Merge changes I6728ef75,I5f321aa8 into stable-2.11

* changes:
  Make JdbcUtil#port() public
  Allow to use GWTORM Key classes in plugins

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/Change.java

@@ -106,7 +106,7 @@ public final class Change {
     private static final long serialVersionUID = 1L;
 
     @Column(id = 1)
-    protected int id;
+    public int id;
 
     protected Id() {
     }

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/LabelId.java

@@ -23,9 +23,9 @@ public class LabelId extends StringKey<com.google.gwtorm.client.Key<?>> {
   public static final LabelId SUBMIT = new LabelId("SUBM");
 
   @Column(id = 1)
-  protected String id;
+  public String id;
 
-  protected LabelId() {
+  public LabelId() {
   }
 
   public LabelId(final String n) {

gerrit-reviewdb/src/main/java/com/google/gerrit/reviewdb/client/PatchSet.java

@@ -32,12 +32,12 @@ public final class PatchSet {
     private static final long serialVersionUID = 1L;
 
     @Column(id = 1)
-    protected Change.Id changeId;
+    public Change.Id changeId;
 
     @Column(id = 2)
-    protected int patchSetId;
+    public int patchSetId;
 
-    protected Id() {
+    public Id() {
       changeId = new Change.Id();
     }
 

gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java

@@ -26,7 +26,7 @@ public class JdbcUtil {
     return hostname;
   }
 
-  static String port(String port) {
+  public static String port(String port) {
     if (port != null && !port.isEmpty()) {
       return ":" + port;
     }