PRD-4379: Final API changes to allow definition of metadata via xml as well as via API