comment out s3 credentials
Merge branch 'refs/heads/s3'