Updated for the new aws sdk
Merge pull request #4000 from GrahamCampbell/4.1-aws

Updated for the new aws sdk