Fixes file upload 500s, also some draft/ready bugs
Merge pull request #1804 from Stanford-Online/jbau-file-upload-fixes

Fixes file upload 500s, also some draft/ready bugs