FLUID-4907: Expanded the "@" references in the auxiliary schema with the actual values.
Merge branch 'master' into FLUID-4907
Merge branch 'master' into FLUID-4907
FLUID-4907: Added the unit test for expanding templates to retrieve schema values.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907