[#64101586]use s3 on staging
Merge 64101586-s3-file-uploads to master

[Completes #64101586]