Fixes issues with conflated nodes and skipped previews in the catalog XML.
Incorrect use of addChild was causing overlaid properties not to be merged correctly when performing an include.
This restores the ability to use includes in -set.xml files visible to the catalog code, and also exposes some problems / validation issues in our -set.xml files. (Which can of course be fixed)
