BAMPFA-216: Add support for ranges separated by em and en dashes.
Merge branch 'BAMPFA-79' into cspace-deployment_4.0
Merge branch 'cspace-deployment_4.0' into bampfa_4.0