BAMPFA-79: Add other lexer rule, and allow question mark at end of oneDisplayDate.
BAMPFA-79: Add support for year-month-day.
Merge branch 'cspace-deployment_4.0' into bampfa_4.0