CRM-13497 - Update CodeGen to handle xml mods
CRM-13497 - Additional xml updates
Merge pull request #2200 from colemanw/CRM-13497

CRM-13497 - Update CodeGen to handle xml mods