This commit addresses a few miscellaneous issues with upgrader:

kenneth_suter

17.54.2007 d7d04e6626869b086f61e39e5c05346a765baf7c

 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerHealthChecker.java

@@ -78,16 +78,14 @@
      if (installation.getStatus().isServerRunning()) {
        new ServerController(installation).stopServer(true);
      }
      OperationOutput op = control.startServer(true);
      OperationOutput op = control.startServer(false);
      errors = op.getErrorMessages(UNHEALTHY_SERVER_LOG_REGEX);
    } catch (Exception e) {
      if (e instanceof ApplicationException) {
        throw (ApplicationException)e;
      } else {
        throw new ApplicationException(ApplicationException.Type.APPLICATION,
                "Server health check failed.  Please resolve the following " +
                        "before running the upgrade " +
                        "tool: " + e.getLocalizedMessage(), e);
                "Server health check failed: " + e.getLocalizedMessage(), e);
      }
    } finally {
      if (control != null) {