LPS-44697 support for finding vocabularies by several groups (and additional cleanup)