Improve validation for vocabularies and lock entity validator version.

#6659 
@rbran100 In addition to vocabulary validation i'm locking the entity validator version for two reason:
1. We need this one lock.
2. There was some API changes. Except for minor errors that i'll fix later this one is almost finished.