FLUID-5210: Added a merge policy

Adds a merge policy to the composite panel for merging selectorsToIgnore. This is necessary for the case where the composite panel has defined selectorsToIgnore. When the auxBuilder is run it needs to add selectorsToIgnore for the subpanel containers.
Merge branch 'FLUID-5210'

* FLUID-5210:
  FLUID-5210: Added a merge policy
Merge branch 'master' into FLUID-5205
FLUID-5205: fixed location of renderOnPreference

The auxbuilder had been putting the renderOnPreference configuration in the top level sub components configuration, but it had to be moved down to the options due to restrictions on configuration that can be supplied. This has been addressed and a new integration test added to the builder unit tests.
Merge remote-tracking branch 'justin/FLUID-5205' into PFID
Update to test latest Infusion