Merge changes Idf8d0513,I4caa8047

* changes:
  Support reindexing immediately after NoteDb upgrade
  Expand test for Reindex program
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
index 9510f5e..f9811c6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
@@ -17,13 +17,12 @@
 import static com.google.gerrit.server.schema.JdbcUtil.hostname;
 import static com.google.gerrit.server.schema.JdbcUtil.port;
 
-import java.io.IOException;
-import org.eclipse.jgit.lib.Config;
-
 import com.google.common.base.Strings;
 import com.google.gerrit.server.config.ConfigSection;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.inject.Inject;
+import java.io.IOException;
+import org.eclipse.jgit.lib.Config;
 
 class HANA extends BaseDataSourceType {