Tighten the validation for file content integrity.
Merge pull request #25 from cowofevil/acceptance/master/QA-953-acl_acceptance

Tighten the validation for file content integrity.