Split s3UploadEnabled flag into two separate flags