Merge branch '1.9-maint'

Conflicts:
	community/kernel/src/main/java/org/neo4j/graphdb/DependencyResolver.java
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/extension/KernelExtensions.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestNeoStore.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestXa.java
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	enterprise/com/src/main/java/org/neo4j/com/Client.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/test/java/org/neo4j/test/ha/ClusterManager.java
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java