1.2.0 Milestone: Make 'threads' and 'retries' vars upload-wide

Each upload method includes the fields 'threads' and 'retries'. It would be more consistent and less code to make this an upload-wide setting.

Today: 'config.upload.<method>.threads'
After: 'config.upload.threads'