Extract code to upload imports to S3 to its own class
Merge remote-tracking branch 'origin/improvement/CDB-1166' into release/2.5.6