Merge remote-tracking branch 'upstream/master' into tmp3

# Conflicts:
#	ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java

ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/CockroachDdl.java

@@ -21,21 +21,9 @@ public class CockroachDdl extends PlatformDdl {
     return NativeDbArray.logicalToNative(logicalArrayType);
   }
 
-  /**
-   * Map bigint, integer and smallint all into serial.
-   */
   @Override
   public String asIdentityColumn(String columnDefn, DdlIdentity identity) {
-    if ("bigint".equalsIgnoreCase(columnDefn)) {
-      return "serial";
-    }
-    if ("integer".equalsIgnoreCase(columnDefn)) {
-      return "serial";
-    }
-    if ("smallint".equalsIgnoreCase(columnDefn)) {
-      return "serial";
-    }
-    return columnDefn;
+    return asIdentityStandardOptions(columnDefn, identity);
   }
 
   @Override