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

Conflicts:
	community/cypher/docs/cypher-docs/src/docs/dev/ql/load-csv/index.asciidoc
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/NeoStore.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/StoreFactory.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/LegacyRelationshipStoreReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/LegacyStore.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/VersionAwareLogEntryReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreMigratorIT.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTestIT.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.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/TestPartialTransactionCopier.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLogTest.java
	community/kernel/src/test/java/org/neo4j/test/LogTestUtils.java
	enterprise/backup/src/main/java/org/neo4j/backup/LogicalLogSeeder.java
	enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java
	enterprise/consistency-check/pom.xml
Lower memory overhead of recordchanges.changeCount()
Make Maven happier about the new integrationtests module
Merge pull request #2706 from chrisvest/2.1-integrationtests

Make Maven happier about the new integrationtests module
Merge pull request #2705 from chrisvest/2.1.3-changelogs

Updated changelogs in preperation for 2.1.3
Updated licenses and notice for manual
Fix .localEffects for DistinctPipe
Fix the flakiness of JettyThreadLimitTest
Fix StoreUpgradeIT
Change all pipes to properly report their effects

Conflicts:
	community/cypher/cypher-compiler-2.1/src/main/scala/org/neo4j/cypher/internal/compiler/v2_1/pipes/DistinctPipe.scala
Merge pull request #2704 from chrisvest/2.2-merge-upgrade-1.9

2.2 merge 2.1
Fixing up some oddly worded parts of the caching documentation.
Fixing up some oddly worded parts of the caching documentation.
Fixing up some oddly worded parts of the caching documentation.
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/kernel/CHANGES.txt
	community/kernel/src/main/java/org/neo4j/kernel/DatabaseAvailability.java
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/BranchDetectingTxVerifier.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java
Make it possible to force log rotation

This is only for testing purpose.
Some slight cleanup
Make sure not to hit the parser on every Cypher query in the server
Refactoring: Split query preparation between parsing and plan building

Rationale: This makes it possible to check if a query isPeriodicCommit without having to open a transaction

Signed-off-by: Jakub Wieczorek <jakub@neotechnology.com>
Made it explicit which is the default cache implementation in community and enterprise.