BAMPFA-55: Configure doctype term list.
BAMPFA-85: Use desc attribute in app layer vocab config to populate term descriptions.
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0