fix up s3 cors issues with custom headers
combine content into single call createAndUpload
Merge branch 'feature/content_tidy' into develop