Fixed failing test.
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/cypher/cypher/src/test/scala/org/neo4j/cypher/MatchAcceptanceTest.scala