Merge branch '1.9-maint' into 2.0-merge-1.9

Conflicts:
	community/kernel/CHANGES.txt
	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/xaframework/XaResourceManager.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestInjectMultipleStartEntries.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestJtaCompliance.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestXaFramework.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TxManagerTest.java
	community/server/CHANGES.txt
	community/server/src/test/java/org/neo4j/server/DatabaseTuningDocIT.java
	community/server/src/test/java/org/neo4j/server/NeoServerPortConflictDocIT.java
	community/server/src/test/java/org/neo4j/server/NeoServerShutdownLoggingDocIT.java
	community/server/src/test/java/org/neo4j/server/NeoServerStartupLoggingDocIT.java
	community/server/src/test/java/org/neo4j/server/database/TestCommunityDatabase.java
	community/server/src/test/java/org/neo4j/server/helpers/ServerBuilder.java
	community/server/src/test/java/org/neo4j/server/preflight/TestPreflightTasks.java
	community/server/src/test/java/org/neo4j/server/rest/web/UserAgentCollectorDocIT.java
	community/server/src/test/java/org/neo4j/server/web/TestJetty6WebServer.java
	cypher-plugin/pom.xml
	enterprise/backup/CHANGES.txt
	enterprise/cluster/CHANGES.txt
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/MultiPaxosContext.java
	enterprise/ha/CHANGES.txt
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/transaction/MasterTxIdGenerator.java
	enterprise/ha/src/test/java/org/neo4j/kernel/index/AutoIndexConfigIT.java
	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