Move cypher tests from JUnit to FunSuite
Cleanups
Merge pull request #2631 from davidegrohmann/kill-junit

Kill JUnit vol 3
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/cypher/cypher-compiler-2.1/src/main/scala/org/neo4j/cypher/internal/compiler/v2_1/planner/QueryProjection.scala
	community/cypher/docs/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
Merge pull request #2636 from davidegrohmann/merge-2.1-into-master

Merge 2.1 into master