Improve validation for vocabularies and lock entity validator version.
More work.
Merge pull request #6744 from openscholar/6659-improve

Improve validation for vocabularies and lock entity validator version.