FLUID-5211: Pass down the addtional options defined in the auxiliary schema for subpanels to constructed grade.
Merge remote-tracking branch 'cindy/FLUID-5211'

* cindy/FLUID-5211:
  FLUID-5211: Pass down the addtional options defined in the auxiliary schema for subpanels to constructed grade.
Merge branch 'master' into FLUID-5205 and resolve conflicts

Conflicts:
	src/framework/preferences/js/AuxBuilder.js
	src/tests/framework-tests/preferences/js/AuxBuilderTests.js