BAMPFA-35: Configure country vocabulary with values from XDB.
BAMPFA-75: Fix error when initializing vocabularies with terms containing apostrophes.
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0