FLUID-4330: Final tidy-up - eliminated fluid.resolveEnvironment and kin, as well as fluid.expander.expandLight - consolidated into a single fluid.expand with consistent "initter" and "target" semantics for all source types