Make the S3 SSL usage configurable
Allow password field to be NULL
Merge remote-tracking branch 'upstream/master'