Merge branch '1.9-maint' into merge

Conflicts:
	community/cypher/src/test/scala/org/neo4j/cypher/internal/executionplan/builders/IndexQueryBuilderTest.scala
	community/kernel/CHANGES.txt
	community/kernel/src/main/java/org/neo4j/graphdb/GraphDatabaseService.java
	community/kernel/src/main/java/org/neo4j/helpers/collection/Iterables.java
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/tooling/Clock.java
	community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/BatchGraphDatabaseImpl.java
	community/kernel/src/test/java/org/neo4j/test/EmbeddedDatabaseRule.java
	community/server/CHANGES.txt
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	community/server/src/test/java/org/neo4j/server/helpers/ServerBuilder.java
	community/shell/src/main/java/org/neo4j/shell/kernel/ReadOnlyGraphDatabaseProxy.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupImpl.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupServer.java
	enterprise/backup/src/main/java/org/neo4j/backup/OnlineBackupKernelExtension.java
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/ClusterConfiguration.java
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/heartbeat/HeartbeatState.java
	enterprise/com/src/main/java/org/neo4j/com/Client.java
	enterprise/com/src/main/java/org/neo4j/com/ResourcePool.java
	enterprise/com/src/main/java/org/neo4j/com/ServerUtil.java
	enterprise/com/src/test/java/org/neo4j/com/MadeUpServer.java
	enterprise/ha/CHANGES.txt
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighAvailabilityConsoleLogger.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityModeSwitcher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterServer.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/SlaveServer.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/lock/LockManagerModeSwitcher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/lock/SlaveLockManager.java
	enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestBasicHaOperations.java
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java
	enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
	packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/CHANGES.txt
	packaging/standalone/standalone-community/src/main/distribution/text/community/CHANGES.txt
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/CHANGES.txt