Make sure to clear validator errors when validating a doc multiple times #2302
Merge branch 'master' into gh-2302