FLUID-4927: Added uiOptions tests for non-default uioptions.
FLUID-4927: Fixed text field slider non-declarative settings. Tests pass.
Merge remote-tracking branch 'yura/FLUID-4927-b' into FLUID-4927-b
Merge remote-tracking branch 'acheetham/FLUID-4323' into demo

* acheetham/FLUID-4323:
  FLUID-4323: CSS fixes to make page responsive to UIO text size and line spacing adjustments; add TOC container.
FLUID-4323: Clean-up of HTML and improvements to semantics of markup.
Merge branch 'demo' into FLUID-4323-demo
FLUID-4323: Implemented "simplified content".
Merge remote-tracking branch 'upstream/demo' into demo
FLUID-4323: Fixed the way to feed in the content container into simplifiedContent component.
Merge remote-tracking branch 'jobara/FLUID-4927-b' into demo

* jobara/FLUID-4927-b:
  FLUID-4927: Fixed text field slider non-declarative settings. Tests pass.
  FLUID-4927: Added uiOptions tests for non-default uioptions.
Merge remote-tracking branch 'upstream/demo' into demo
FLUID-4323: Changes for high-contrast.
Merge branch 'demo' into FLUID-4323-demo
Merge branch 'FLUID-4323' into FLUID-4323-demo
FLUID-4323: Moved the content selector into options.selectors block.
Merge remote-tracking branch 'cindyli/demo' into demo

* cindyli/demo:
  FLUID-4323: Moved the content selector into options.selectors block.
  FLUID-4323: Fixed the way to feed in the content container into simplifiedContent component.
  FLUID-4323: Implemented "simplified content".
FLUID-4323: More changes for high-contrast.
Merge branch 'demo' into FLUID-4323-demo

Conflicts:
	src/webapp/integration-demos/uiOptions/ClimateChange.html
Merge branch 'FLUID-4323' into FLUID-4323-demo