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
Merge branch '1.9-maint' into 2.0-maint

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java
Merge branch '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