Fixes #5813 - CLI content uploads BZ1102260
Merge pull request #177 from daviddavis/temp/20140528121820

Content uploads