config consistency for s3_secure + s3_encrypt

s3_secure + s3_encrypt should be consistent in sample config, etc