Try to work around bug 350088 in p2.
diff --git a/releng/build-scripts/build/p2helper.xml b/releng/build-scripts/build/p2helper.xml
index edb8631..2f37d15 100644
--- a/releng/build-scripts/build/p2helper.xml
+++ b/releng/build-scripts/build/p2helper.xml
@@ -25,7 +25,7 @@
         		<param name="versionnext" expression="${jdt.feature.version.next}"/>
                 <mapper type="glob" from="${content.origFile}" to="${content.transFile}"/>
         </xslt>
-        <move file="${otdtUpdatesDir}/${content.transFile}" tofile="${otdtUpdatesDir}/${content.origFile}" overwrite="yes"/>	
+        <copy file="${otdtUpdatesDir}/${content.transFile}" tofile="${otdtUpdatesDir}/${content.origFile}" overwrite="yes"/>	
     </target>
 
     <target name="installFeature">
diff --git a/releng/build-scripts/build/patch-content-xml.xsl b/releng/build-scripts/build/patch-content-xml.xsl
index ece54b5..fdcfd12 100644
--- a/releng/build-scripts/build/patch-content-xml.xsl
+++ b/releng/build-scripts/build/patch-content-xml.xsl
@@ -2,11 +2,11 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fn="http://www.w3.org/2004/07/xpath-functions" xmlns:xdt="http://www.w3.org/2004/07/xpath-datatypes" exclude-result-prefixes="xs fn xdt">
    <xsl:param name="version"/>
    <xsl:param name="versionnext" />
-   <xsl:template match="lifeCycle/required[@name='org.eclipse.jdt.feature.group' and @greedy='false']">
+   <xsl:template match="lifeCycle/required[@name='org.eclipse.jdt.core' and @greedy='false']">
         <xsl:copy>
                 <xsl:attribute name="namespace"><xsl:value-of select="@namespace" /></xsl:attribute>
                 <xsl:attribute name="name">org.eclipse.jdt.core</xsl:attribute>
-                <xsl:attribute name="range"><xsl:value-of select="@range" /></xsl:attribute>
+                <xsl:attribute name="range">0.0.0</xsl:attribute>
                 <xsl:attribute name="greedy"><xsl:value-of select="@greedy" /></xsl:attribute>
         </xsl:copy>
    </xsl:template>