FLUID-5088: Improved diagnostics for circular or failed expansion process - option path is now propagated up to the site where expansion fails, allowing more intelligible error messages. This enables merging and expansion to be put back into correspondence in terms of signatures and circularity detection strategy, and allows the removal of the old "weak" circularity detection "guardCircularity" that could only operate on units of entire Fluid components. Adding this feature removes a net 4 lines of code from FluidIoC!
Merge branch 'master' into FLUID-5088

Conflicts:
	src/framework/core/js/FluidIoC.js
	src/tests/framework-tests/core/js/FluidIoCTests.js
Merge remote-tracking branch 'amb26/FLUID-5088'

* amb26/FLUID-5088:
  FLUID-5088: Improved diagnostics for circular or failed expansion process - option path is now propagated up to the site where expansion fails, allowing more intelligible error messages. This enables merging and expansion to be put back into correspondence in terms of signatures and circularity detection strategy, and allows the removal of the old "weak" circularity detection "guardCircularity" that could only operate on units of entire Fluid components. Adding this feature removes a net 4 lines of code from FluidIoC!
Merge branch 'master' into FLUID-4931