Reuse the dmsdocument vocabularies utilities, use now principalsource.Principals in it, updated tests