FIX: rename S3 specific config variables
Merge pull request #566 from reneme/fix-s3_test

FIX: Rename S3 Specific Config Variables