Merge pull request #2094 from apache/TINKERPOP-2959

TINKERPOP-2959 Allowed parsing of parameters with the grammar