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/Clause.scala
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/ast/Hint.scala
	community/cypher/cypher/src/test/scala/org/neo4j/cypher/UsingAcceptanceTest.scala