add org.mozilla.javascript to the build
Fix malformed xml files after merge