Merge branch 'cleanup_after_1_8_removal' into peg

Conflicts:
	community/cypher/src/main/scala/org/neo4j/cypher/CypherParser.scala
	community/cypher/src/test/scala/org/neo4j/cypher/CypherParserTest.scala