updating the term lists of several fields; adding updated custom xmlmerge config file; adding new vocabularies where needed