Merge branch 'master' into FLUID-4907
Merge remote-tracking branch 'yura/FLUID-4907' into FLUID-4907
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907
FLUID-4907: fixed broken builder tests.

Will need to expand on the builder tests to include the various types of configuration for the auxiliary schema, as well as to test that the generated grade is assembled correctly.
FLUID-4907: Modified auxiliary builder to include the common options for panels and enactors.