container directory sturcture change
Merge branch 'HalloweenBugFixes' of https://github.com/hydroshare/hydroshare into HalloweenBugFixes