FLUID-4330: Further rationalisation in expandOptions - eliminated "preserveFromExpansion" in favour of mergePolicy modification, preparing final conversion to gingerness. Fixed further bugs in expansion pathway relating to "tall late things" with further tests for ginger cases. Improved messages in CachingTests.js