Unit test 'CFileValidatorTest' has been updated to expose issue #2821
CFileValidator has been fixed.
Merge pull request #2826 from klimov-paul/2821-file-validator

Fix #2821 file validator