Refactor Cypher query grammar to sequence of clauses
Split test covering multiple Cypher versions
Merge pull request #1241 from cleishm/grammar_rework

Refactor Cypher query grammar to sequence of clauses