Removed user references for directory and deployed files, Metadata fixes
Updated default owner. Fixed up permissions.
Merge branch 'master' into cf902