Update composer.json
Merge branch '2.0' into aws-sdk-update
Update AWS SDK for PHP