FLUID-4919 - completed modernisation of Uploader and Reorderer

No manual init components now remain. Various improvements to framework diagnostics and logging, fix for http://issues.fluidproject.org/browse/FLUID-4987 and http://issues.fluidproject.org/browse/FLUID-4978