BAMPFA-79: Add code to offset dates by circa interval, instead of using qualifier.
BAMPFA-79: Remove an unused file.
Merge branch 'BAMPFA-79' into ucb-deploy_4.0