Integration from //guest/craig_mcpheeters/jam/src/...
This work area now contains both the Alias|Wavefront changes, and
the latest integrations from the mainline. There are some changes
in this area which shouldn't be merged back into the mainline.
As I merge this branch back into my jam/src/... branch, I'll
leave out a few of the changes.