aws-java-sdk-s3 1.9.6 upgrade + refactor