Merge remote-tracking branch 'upstream/1.9-maint'

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/TransactionWriter.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/ReadOnlyTransactionImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/ReadOnlyTxManager.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TransactionImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxManager.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/XidImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/Monitors.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestTransactionImpl.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TxManagerTest.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestLogPruneStrategy.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestLogPruning.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLogTest.java
	community/kernel/src/test/java/org/neo4j/test/GraphStoreFixture.java
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/cluster/ClusterContext.java
	enterprise/com/src/main/java/org/neo4j/com/Server.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCache.java
	enterprise/ha/src/main/java/org/neo4j/kernel/impl/cache/GCResistantCacheProvider.java
	enterprise/ha/src/test/java/org/neo4j/kernel/impl/cache/TestGCResistantCache.java