Added fixes to the storage and upload mechanisms
SF2020 storage is slightly different and will therefore crash the Upload system.
This should address these issues.
Uploads in systems using SF2020 should work properly now. This is only figure at
the time of writing.
Reviewed By: sebastian
Differential Revision: https://phabricator.magic3w.com/D304