fix the build - regenerate and merge build.xml files