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
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