Split s3UploadEnabled flag into two, to allow ftp, https, s3 ftp, or s3 https to all be disabled/enabled separately.
Merge pull request #431 from atlasapi/split-rp-s3-flags

Split s3UploadEnabled flag into two separate flags