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
Fixes after code review
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
Accurately report cache sizes before and after purge.

This fixes a merge resolution mishap that occurred in 178be5393fcfaf860c72ba2b9f26acc05b621375.

Also property state units, it's bytes (B) not bits (b), and report kiB when claiming to do so, not MiB.
Merge pull request #2740 from thobe/2.0-cache-purge-statistics

Accurately report cache sizes before and after purge.
Doc: Remove uses of START and mark as deprecated

o Remove START from CypherSqlDocIT
o This tutorial should be reworked, for now we just remove any mention of START
o Discourage use of START. Fix Cypher SQL example

signed-off-by: Jakub Wieczorek <jakub.wieczorek@neotechnology.com>
Doc: Rename Cypher endpoint sections in REST guide to make clear which endpoint is old and which is new

signed-off-by: Jakub Wieczorek <jakub.wieczorek@neotechnology.com>
Merge pull request #2746 from boggle/no-start

Discourage use of START
Revert "Revert "More parallellization in the batch importer""

This reverts commit 45b41deb576ca39663cac9dee8cc391421ab764d.
Tagging for version 2.1.3