FLUID-4926, FLUID-4919: Resolve invokers onto "func", incomplete work on phase 2 of Uploader - most "strategies" now converted, non-working commit for Uploader