Convert tests to CypherFunSuite
Rename mergeUp & mergeDown to supremum & infimum

AKA leastUpperBound and greatestLowerBound
Merge pull request #3222 from cleishm/infimum_supremum

Rename mergeUp & mergeDown to leastUpperBound & greatestLowerBound
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint

Conflicts:
	community/cypher/cypher-compiler-2.0/src/test/scala/org/neo4j/cypher/internal/compiler/v2_0/symbols/TypeRangeTest.scala
	community/cypher/cypher-compiler-2.0/src/test/scala/org/neo4j/cypher/internal/compiler/v2_0/symbols/TypeSpecTest.scala
	community/cypher/cypher-compiler-2.1/src/main/scala/org/neo4j/cypher/internal/compiler/v2_1/ast/IterableExpressions.scala
	community/cypher/cypher-compiler-2.1/src/main/scala/org/neo4j/cypher/internal/compiler/v2_1/functions/Coalesce.scala
	community/cypher/cypher-compiler-2.1/src/main/scala/org/neo4j/cypher/internal/compiler/v2_1/symbols/SymbolTable.scala
	community/cypher/cypher-compiler-2.1/src/test/scala/org/neo4j/cypher/internal/compiler/v2_1/ast/CaseExpressionTest.scala
	community/cypher/cypher-compiler-2.1/src/test/scala/org/neo4j/cypher/internal/compiler/v2_1/symbols/CypherTypeTest.scala
Merge remote-tracking branch 'upstream/2.1-maint'