Revert "Revert "Support more AWS credentials providers for S3 storage""
Merge pull request #973 from metamx/revert-972-revert-837-master

Revert "Revert "Support more AWS credentials providers for S3 storage""