rollback to previous s3 syntax (ie. subdomains)
added a warning regarding the case of the s3_upload_bucket setting

until we get proper setting validation.
opps. missed a comment
Merge pull request #1222 from ZogStriP/fix-s3-related-issues

Fix s3 related issues