CRM-13497 - Update CodeGen to handle xml mods