Inadequate treatment of timestamps in QueryStatementImpl

QueryStatementImpl seems to inadequately treat the query criteria when they are of type date.
QueryStatementImpl only generates the literal for the date you want to query (eg '2012-06-28T22: 00:00.000 Z '), excluding the literal 'TIMESTAMP '.
The literal 'TIMESTAMP ' is necessary in order to, as specified in the grammar CmisQlStrictLexer.g, process the field as a date type (TIMESTAMP '2012-06-28T22: 00:00.000 Z ').