AI-621 - try direct REST client api call to obtain upload_id
Merge remote-tracking branch 'origin/version4' into version4