File helper and Security helper changes suggested by SachinC

Merged Sandeep S. Shewalkar requested to merge File&SecurityHelper into master