Package uploads: fixing some bugs
Merge pull request #2915 from daviddavis/temp/20130910112210

Package uploads: fixing some bugs
Content Uploads: Moved test file