1086278 - Convert upload into a polling command.
Fixes in response to pull request comments.
Merge branch 'rbarlow-1086278'