Merge branch '2.1-maint' into 2.2-merge-2.1

Conflicts:
	community/consistency-check/src/main/java/org/neo4j/consistency/checking/incremental/intercept/CheckingTransactionInterceptor.java
	community/consistency-check/src/main/java/org/neo4j/consistency/checking/incremental/intercept/CheckingTransactionInterceptorProvider.java
	community/consistency-check/src/main/java/org/neo4j/consistency/checking/incremental/intercept/InconsistencyLoggingTransactionInterceptorProvider.java
	community/consistency-check/src/main/java/org/neo4j/consistency/checking/incremental/intercept/VerifyingTransactionInterceptorProvider.java
	community/consistency-check/src/main/java/org/neo4j/consistency/store/windowpool/LoggingStatisticsListener.java
	community/consistency-check/src/main/java/org/neo4j/consistency/store/windowpool/MappedWindow.java
	community/consistency-check/src/main/java/org/neo4j/consistency/store/windowpool/ScanResistantWindowPool.java
	community/consistency-check/src/main/java/org/neo4j/consistency/store/windowpool/ScanResistantWindowPoolFactory.java
	community/consistency-check/src/main/java/org/neo4j/consistency/store/windowpool/WindowPoolImplementation.java
	community/consistency-check/src/test/java/org/neo4j/consistency/checking/incremental/IncrementalCheckIntegrationTest.java
	community/consistency-check/src/test/java/org/neo4j/consistency/store/StoreAssertions.java
	community/consistency-check/src/test/java/org/neo4j/consistency/store/windowpool/MappedWindowTest.java
	community/consistency-check/src/test/java/org/neo4j/consistency/store/windowpool/ScanResistantWindowPoolTest.java
	community/consistency-check/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java
	community/cypher/cypher/CHANGES.txt
	community/kernel/CHANGES.txt
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/api/TxState.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxStateImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/NeoStore.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/NeoStoreUtil.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/StoreFactory.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/LogFiles.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreFile.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreFile20.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreMigrator.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreUpgrader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyLuceneCommandReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/Legacy19CommandReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/Legacy19DynamicStringStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/Legacy19LogIoUtil.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/Legacy19PropertyStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/Legacy19Store.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/StoreFile19.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v20/Legacy20Store.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v20/StoreFile20.java
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/CalculateDenseNodesStep.java
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporter.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/api/state/IndexQueryTransactionStateTest.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestGraphProperties.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/v20/Legacy20NodeStoreReaderTest.java
	community/neo4j/src/test/java/upgrade/StoreMigratorFrom19IT.java
	community/neo4j/src/test/java/upgrade/StoreMigratorIT.java
	community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupClient.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupServer.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java
	enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java
	enterprise/cluster/src/main/java/org/neo4j/cluster/member/paxos/PaxosClusterMemberEvents.java
	enterprise/com/src/main/java/org/neo4j/com/Client.java
	enterprise/com/src/main/java/org/neo4j/com/Protocol.java
	enterprise/com/src/main/java/org/neo4j/com/Response.java
	enterprise/com/src/main/java/org/neo4j/com/Server.java
	enterprise/com/src/test/java/org/neo4j/com/MadeUpClient.java
	enterprise/com/src/test/java/org/neo4j/com/MadeUpServer.java
	enterprise/com/src/test/java/org/neo4j/com/ServerTest.java
	enterprise/com/src/test/java/org/neo4j/com/TestCommunication.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient201.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterClient210.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/backup/HaBackupProvider.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToMaster.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterServer.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/SlaveClient.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/MasterClient.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/MasterClientResolver.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/slave/SlaveServer.java
	enterprise/ha/src/test/java/org/neo4j/ha/ClusterTransactionTest.java
	enterprise/ha/src/test/java/org/neo4j/ha/monitoring/EideticRequestMonitor.java
	enterprise/ha/src/test/java/org/neo4j/ha/monitoring/RemoteRequestMonitoringIT.java
	enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterMembersSnapshotTest.java
	integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java