Rebase on the latest 2.0 branch

Author: Zhen Li

driver/src/test/java/org/neo4j/driver/internal/messaging/v2/ExplicitTransactionTest.java

@@ -24,8 +24,8 @@
 import java.util.function.Consumer;
 
 import org.neo4j.driver.internal.Bookmarks;
+import org.neo4j.driver.internal.DefaultBookmarksHolder;
 import org.neo4j.driver.internal.ExplicitTransaction;
-import org.neo4j.driver.internal.NetworkSession;
 import org.neo4j.driver.internal.messaging.request.PullAllMessage;
 import org.neo4j.driver.internal.messaging.request.RunMessage;
 import org.neo4j.driver.internal.spi.Connection;

driver/src/test/java/org/neo4j/driver/internal/messaging/v2/NetworkSessionTest.java

@@ -29,6 +29,7 @@
 
 import org.neo4j.driver.internal.BoltServerAddress;
 import org.neo4j.driver.internal.Bookmarks;
+import org.neo4j.driver.internal.DefaultBookmarksHolder;
 import org.neo4j.driver.internal.NetworkSession;
 import org.neo4j.driver.internal.messaging.BoltProtocol;
 import org.neo4j.driver.internal.messaging.request.PullAllMessage;

driver/src/test/java/org/neo4j/driver/internal/messaging/v4/BoltProtocolV4Test.java

@@ -26,7 +26,7 @@
 import org.neo4j.driver.internal.Bookmarks;
 import org.neo4j.driver.internal.BookmarksHolder;
 import org.neo4j.driver.internal.ExplicitTransaction;
-import org.neo4j.driver.internal.SimpleBookmarksHolder;
+import org.neo4j.driver.internal.DefaultBookmarksHolder;
 import org.neo4j.driver.internal.handlers.PullAllResponseHandler;
 import org.neo4j.driver.internal.handlers.RunResponseHandler;
 import org.neo4j.driver.internal.messaging.BoltProtocol;
@@ -71,7 +71,7 @@ protected void testFailedRunInAutoCommitTxWithWaitingForResponse( Bookmarks book
     {
         // Given
         Connection connection = connectionMock( mode, protocol );
-        BookmarksHolder bookmarksHolder = new SimpleBookmarksHolder( bookmarks );
+        BookmarksHolder bookmarksHolder = new DefaultBookmarksHolder( bookmarks );
 
         CompletableFuture<InternalStatementResultCursor> cursorFuture =
                 protocol.runInAutoCommitTransaction( connection, STATEMENT, bookmarksHolder, config, true ).asyncResult().toCompletableFuture();
@@ -93,7 +93,7 @@ protected void testSuccessfulRunInAutoCommitTxWithWaitingForResponse( Bookmarks
     {
         // Given
         Connection connection = connectionMock( mode, protocol );
-        BookmarksHolder bookmarksHolder = new SimpleBookmarksHolder( bookmarks );
+        BookmarksHolder bookmarksHolder = new DefaultBookmarksHolder( bookmarks );
 
         CompletableFuture<InternalStatementResultCursor> cursorFuture =
                 protocol.runInAutoCommitTransaction( connection, STATEMENT, bookmarksHolder, config, true ).asyncResult().toCompletableFuture();
@@ -147,7 +147,7 @@ protected void testRunWithoutWaitingForRunResponse( boolean autoCommitTx, Transa
         CompletionStage<InternalStatementResultCursor> cursorStage;
         if ( autoCommitTx )
         {
-            BookmarksHolder bookmarksHolder = new SimpleBookmarksHolder( initialBookmarks );
+            BookmarksHolder bookmarksHolder = new DefaultBookmarksHolder( initialBookmarks );
             cursorStage = protocol.runInAutoCommitTransaction( connection, STATEMENT, bookmarksHolder, config, false ).asyncResult();
         }
         else