Fix a message.
Tighten the validation for file content integrity.
Merge pull request #21 from cowofevil/acceptance/master/QA-1066-acl_inheritance

Acceptance/master/qa 1066 acl inheritance