FLUID-5048: id collision where two separate invocations of the renderer targetting the same document require label target rewriting
FLUID-5048: Added in missing test fixture HTML file
FLUID-5069: Clean up UIO code by removing legacy layout preference and an enactor for IE6 colour inversion.
Merge branch 'master' into FLUID-5069
Merge branch 'master' into FLUID-5069
Merge branch 'master' into FLUID-5069

Conflicts:
	src/webapp/components/uiOptions/js/SettingsPanels.js
	src/webapp/components/uiOptions/js/UIEnhancer.js
	src/webapp/tests/component-tests/uiOptions/js/UIOptionsTests.js
Merge remote-tracking branch 'amb26/FLUID-5048'

* amb26/FLUID-5048:
  FLUID-5048: Added in missing test fixture HTML file
  FLUID-5048: id collision where two separate invocations of the renderer targetting the same document require label target rewriting
Merge branch 'master' into FLUID-5069
Merge remote-tracking branch 'cindyli/FLUID-5069'

* cindyli/FLUID-5069:
  FLUID-5069: Clean up UIO code by removing legacy layout preference and an enactor for IE6 colour inversion.