FLUID-5213: Allow the specifying of a merge function to output the to-be-added option based on both existing and new values. Also removed the feature in the aux builder that adds "fluid.prefs.compositePanel" grade to composite panels.
Merge branch 'master' into FLUID-5213
FLUID-5213: Code clean up.
FLUID-5213: Use fluid.model.parseEL to split string by delimiter.
FLUID-5213: The auxiliary builder uses framework built-in mergePolicy to merge gradeNames rather than manually invoking the merge function.
Merge branch 'master' into FLUID-5213 and resolve conflicts

Conflicts:
	src/framework/preferences/js/AuxBuilder.js
Merge branch 'master' into FLUID-5213, resolve conflicts and renamed "validationFunc" in the aux builder to "optionRequired".

Conflicts:
	src/framework/preferences/js/AuxBuilder.js
Merge branch 'master' into FLUID-5213
FLUID-5213: Fixed the aux builder unit tests due to merging in master.
FLUID-5213: Simplified the ways to, 1. merge existing option values with system default values; 2. add "container" option for view or renderer components only.
Merge branch 'master' into FLUID-5213
FLUID-5213: Use the presence of "container" in the component's "argumentMap" to detect whether a component accepts a "container", as well as cleaning up the unit tests.
FLUID-5103: Fix for dynamic reorderer failure to take account of new elements until one is moved
Merge remote-tracking branch 'amb26/FLUID-5103'

* amb26/FLUID-5103:
  FLUID-5103: Fix for dynamic reorderer failure to take account of new elements until one is moved
FLUID-5213: Adjusted comment and logic for "container detection functionality"
Merge branch 'FLUID-5213'

* FLUID-5213:
  FLUID-5213: Adjusted comment and logic for "container detection functionality"
  FLUID-5213: Use the presence of "container" in the component's "argumentMap" to detect whether a component accepts a "container", as well as cleaning up the unit tests.
  FLUID-5213: Simplified the ways to, 1. merge existing option values with system default values; 2. add "container" option for view or renderer components only.
  FLUID-5213: Fixed the aux builder unit tests due to merging in master.
  FLUID-5213: The auxiliary builder uses framework built-in mergePolicy to merge gradeNames rather than manually invoking the merge function.
  FLUID-5213: Use fluid.model.parseEL to split string by delimiter.
  FLUID-5213: Code clean up.
  FLUID-5213: Allow the specifying of a merge function to output the to-be-added option based on both existing and new values. Also removed the feature in the aux builder that adds "fluid.prefs.compositePanel" grade to composite panels.