Refactor S3 upload manager. Fix regression where .vod wasn't uploaded