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

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/DefaultFileSystemAbstraction.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/AbstractStore.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/FileSystemAbstraction.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/IdGeneratorImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/RelationshipTypeStore.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyDynamicStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyNeoStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyNodeStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyPropertyIndexStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyPropertyStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyRelationshipStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyRelationshipTypeStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxLog.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/DirectLogBuffer.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/LogBuffer.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/LogIoUtils.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLogFiles.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/DumpLogicalLog.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/FileUtils.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/IoPrimitiveUtils.java
	community/kernel/src/test/java/org/neo4j/kernel/CannedFileSystemAbstraction.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestChangingOfLogFormat.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/index/TestIndexCommand.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestDynamicStore.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestGraphProperties.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestIdGenerator.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestPersistenceWindowPoolContention.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestXa.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestXaFramework.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/LogMatchers.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestPartialTransactionCopier.java
	community/kernel/src/test/java/org/neo4j/test/IdJumpingFileSystemAbstraction.java
	community/kernel/src/test/java/org/neo4j/test/LogTestUtils.java