DATASOLR-62 - Add support for sort when using annotated query
DATASOLR-63 - Support sort when using named queries