Merge branch '1.5' into 1.5-async

Author: Zhen

driver/src/main/java/org/neo4j/driver/v1/Config.java

@@ -331,13 +331,29 @@ public ConfigBuilder withMaxSessions( int size )
          *
          * @param size the max number of idle sessions to keep open
          * @return this builder
+         * @deprecated please use {@link #withMaxIdleConnections(int)} instead.
          */
+        @Deprecated
         public ConfigBuilder withMaxIdleSessions( int size )
         {
             this.maxIdleConnectionPoolSize = size;
             return this;
         }
 
+        /**
+         * The max number of idle connections to keep open at once. Configure this
+         * higher for greater concurrency, or lower to reduce the pressure on the
+         * database instance.
+         *
+         * @param size the max number of idle connections to keep open
+         * @return this builder
+         */
+        public ConfigBuilder withMaxIdleConnections( int size )
+        {
+            this.maxIdleConnectionPoolSize = size;
+            return this;
+        }
+
         /**
          * Please use {@link #withConnectionLivenessCheckTimeout(long, TimeUnit)}.
          *

driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java

@@ -417,7 +417,7 @@ private static Config driverConfig()
         return Config.build()
                 .withTrustStrategy( trustAllCertificates() )
                 .withEncryption()
-                .withMaxIdleSessions( 1 )
+                .withMaxIdleConnections( 1 )
                 .withConnectionLivenessCheckTimeout( 1, TimeUnit.HOURS )
                 .toConfig();
     }