OPENDJ-2016: New on disk merge import strategy based on storage engine.

Yannick Lecaillez

09.07.2015 641e89ef0e15c9edde69f3b8cf82c7dd5f68687a

 opendj-server-legacy/src/test/java/org/opends/server/tasks/TasksTestCase.java

@@ -173,6 +173,7 @@
    });
  }

  @Test(enabled = false) // This isn't a test method, but TestNG thinks it is.
  public static void waitTaskCompletedSuccessfully(DN taskDN) throws Exception
  {
    Task task = getDoneTask(taskDN);