PAHMA-690: Reorder concept vocabularies.
PAHMA-690: Reorder concept, place, and taxon vocabularies.
Merge branch 'ucb-deploy_3.2' into pahma_3.2