tweaks from merge of develop-failover branch #1109

Author: ehennum

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/DataMovementManager.java

@@ -16,8 +16,7 @@
 package com.marklogic.client.datamovement;
 
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.dataservices.CallBatcher;
-import com.marklogic.client.query.QueryDefinition;
+import com.marklogic.client.dataservices.impl.CallBatcher;
 import com.marklogic.client.query.RawCtsQueryDefinition;
 import com.marklogic.client.query.StringQueryDefinition;
 import com.marklogic.client.query.StructuredQueryDefinition;

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementManagerImpl.java

@@ -17,7 +17,7 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.dataservices.CallBatcher;
+import com.marklogic.client.dataservices.impl.CallBatcher;
 import com.marklogic.client.impl.DatabaseClientImpl;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.query.QueryDefinition;

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/DataMovementServices.java

@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.marklogic.client.DatabaseClient;
-import com.marklogic.client.dataservices.CallBatcher;
+import com.marklogic.client.dataservices.impl.CallBatcher;
 import com.marklogic.client.dataservices.impl.CallBatcherImpl;
 import com.marklogic.client.impl.DatabaseClientImpl;
 import com.marklogic.client.io.JacksonHandle;

marklogic-client-api/src/main/java/com/marklogic/client/datamovement/impl/JobReportImpl.java

@@ -18,7 +18,7 @@
 import java.util.Calendar;
 
 import com.marklogic.client.datamovement.*;
-import com.marklogic.client.dataservices.CallBatcher;
+import com.marklogic.client.dataservices.impl.CallBatcher;
 
 public class JobReportImpl implements JobReport {