Merge pull request #1835 from cleishm/ast

Ensure InputTokens in the AST do not affect equality
Merge branch 'neo4j/1.9-maint' into master