Updated to Amazon's patched AWSSDK v 1.5.21.0