Split s3UploadEnabled flag into two separate flags

allows ftp, https, s3 ftp, or s3 https to all be disabled/enabled separately.