Fixes for bulk upload, bulk file upload, misc

git-svn-id: https://farcry.jira.com/svn/FC/trunk@12921 8f7d33b6-1012-0410-9a5a-bb7ecce9c363