Add support for s3 in sa-east-1
Merge branch 'katzj-sa-east-s3' into develop

* katzj-sa-east-s3:
  Add support for s3 in sa-east-1