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.
Merge pull request #1622 from easirois/hotfix/1.8.3

Changes to catalog were not merged because they are not needed, the
integration process will generated the output.