Merge pull request #97 from consultantRR/master

config consistency for s3_secure + s3_encrypt