Tweak full uri upload to deal with non-Item content uploads.
Merge branch 'mbst-9893-more-granular-uploads' into stage