Clean up marketplace.xml to pass schema validation