FLUID-4987 Resolved double registration of listeners from demands block issue, tidied fluid.embodyDemands a little further
FLUID-4919: Completed modernisation of Uploader and Reorderer - no manual init components remain. Loosened restriction on naming of "listener" field in listeners to conform with other locations (invokers, expanders). Fixed a broken non-testing IoC Test, improved some more diagnostics on bad listener records