Update aws-java-sdk to 1.8.4 and some polishing