Update some XSD fixes that were found by developers from PTC.  Also

update the catalog file so that it matches what we have in the base
catalog-dita.xml file.