Upgrade AWS Java SDK.
Merge master into develop