FLUID-4907: Fixed a aux builder unit test and having primaryBuilder as an grade of auxBuilder so the primary schema is accessible to assembling rules and getting defaults.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907