Work in progress.  I've fixed the syntax errors and typos in the code
that gets manufactured for Master relations in the Swing layer, as
produced by attempting to build the CFCore 2.0 updates.

I've also made a model change that *should* correct the problem with
the manufactured Tenant code around rule cartridges.  Time for a
full remanufacturing to allow for the changes in the relationships.