Cleanup code styling and formatting mistakes.
Fix tests affected by FM-1191.
Tighten the validation for file content integrity.
Merge pull request #20 from cowofevil/acceptance/master/QA-1063-acl_propagation

Acceptance/master/qa 1063 acl propagation