Merge branch 'dev' of github.com:marklogic/java-client-api into dev

Author: sammefford

src/test/java/com/marklogic/client/test/JacksonDatabindTest.java

@@ -49,7 +49,7 @@
 import com.marklogic.client.query.QueryManager;
 import com.marklogic.client.test.Common;
 import com.marklogic.client.test.BulkReadWriteTest;
-import com.marklogic.client.test.BulkReadWriteTest.City;
+import com.marklogic.client.test.City;
 import com.marklogic.client.test.BulkReadWriteTest.CityWriter;
 
 public class JacksonDatabindTest {