SWC-1852: when asking for upload destinations, use the entity id that we have
Merge pull request #1286 from jay-hodgson/SWC-1852

SWC-1852: when asking for upload destinations, use the entity id that we have