allow more general write options for S3 to be set
Merge branch 'extend-s3-write-options'