change config vars from s3_ to aws_
Merge branch 'release/0.4.2'