FLUID-4907: Fixed the template prefix in the auxiliary schema.
Merge remote-tracking branch 'justin/FLUID-4907' into FLUID-4907
FLUID-4907: A little adjustment on aux schema and combine it as a grade for builder, which should be eventually supplied as a starter grade at instantiating builder.
FLUID-4907: A intermittent work that breaks fat panel demo.
FLUID-4907: Fixed some mistakes in the unit tests.