[#882187] Add s3 to default-config
Merge branch 'master' of github.com:mozilla/popcorn.webmaker.org