Identifiers introduced outside of FOREACH should be in scope inside FOREACH
Merge pull request #2699 from jakub-/foreach-not-seeing-all-identifiers

Identifiers introduced outside of FOREACH should be in scope inside FORE...
Fixing up some oddly worded parts of the caching documentation.
Fixed failed master catch-up after rejoining cluster
Revert "More parallellization in the batch importer"

This reverts commit fd9c7eebb9206b82172676e41bdbb9bd5be4b541.

Conflicts:
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ParallellBatchImporter.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java
Updates changelogs for 2.1.3
Merge pull request #2727 from davidegrohmann/2.1-parallel-batch-import-opt-revert

Revert "More parallellization in the batch importer"
Fixes after code review
Merge pull request #2728 from digitalstain/2.1-2.1.3-changelogs

Updates changelogs for 2.1.3
Move use of nodeManager.isDeleted in DeleteEntityAction to QueryContext API

signed-off-by: Jakub Wieczorek <jakub.wieczorek@neotechnology.com>
Merge pull request #2715 from lutovich/1.9-maint

Fixed failed master catch-up after rejoining cluster
Fix compilation error
Merge remote-tracking branch 'upstream/1.9-maint' into 2.0-maint

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java
Avoid including stores in test-sources for the content bundle of the manual.
Merge pull request #2733 from davidegrohmann/merge-1.9-into-2.0

Merge 1.9 into 2.0
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint

Conflicts:
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/ast/convert/StatementConverters.scala
	community/cypher/cypher-compiler-2.0/src/test/scala/org/neo4j/cypher/internal/compiler/v2_0/parser/CypherParserTest.scala
	community/cypher/cypher/src/test/scala/org/neo4j/cypher/MergeNodeAcceptanceTest.scala
Merge pull request #2736 from davidegrohmann/merge-2.0-into-2.1

Merge 2.0 into 2.1
Make sure the isPeriodicCommit check works gracefully for invalid queries