diff --git a/admin/target-defs/eclipse-4.4.x-luna.target b/admin/target-defs/eclipse-4.4.x-luna.target
index f027b3d359a..a1c834b2336 100644
--- a/admin/target-defs/eclipse-4.4.x-luna.target
+++ b/admin/target-defs/eclipse-4.4.x-luna.target
@@ -1,30 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.4.x (Luna)" sequenceNumber="71">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.4.x (Luna)" sequenceNumber="75">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
 <repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="4.4.2.M20150204-1700"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.4.2.M20150204-1700"/>
+<unit id="org.eclipse.test.feature.group" version="3.6.101.v20150202-1306"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.native.source.feature.group" version="8.5.0.201409172108"/>
-<unit id="org.eclipse.cdt.native.feature.group" version="8.5.0.201409172108"/>
-<repository location="http://download.eclipse.org/tools/cdt/releases/8.5"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201502160819"/>
-<repository location="http://download.eclipse.org/tm/updates/3.7"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="3.4.2.201412180340-r"/>
 <repository location="http://download.eclipse.org/releases/luna"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/>
+<repository location="http://download.eclipse.org/tm/updates/4.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.native.feature.group" version="8.6.0.201502131403"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/8.6"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="1.1.1.201502031934"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/luna/milestones"/>
+</location>
 </locations>
 </target>
diff --git a/admin/target-defs/eclipse-4.5.x-mars.target b/admin/target-defs/eclipse-4.5.x-mars.target
index d7202f7156f..7cf93b4d888 100644
--- a/admin/target-defs/eclipse-4.5.x-mars.target
+++ b/admin/target-defs/eclipse-4.5.x-mars.target
@@ -1,29 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.5.x (Mars)" sequenceNumber="95">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.5.x (Mars)" sequenceNumber="97">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
 <repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201505221634"/>
-<repository location="http://download.eclipse.org/tm/updates/4.0"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.5.2.M20160212-1500"/>
 <unit id="org.eclipse.test.feature.group" version="3.7.0.v20150428-2048"/>
-<unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jgit.feature.group" version="4.1.1.201511131810-r"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.egit.feature.group" version="4.1.1.201511131810-r"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="8.8.1.201602051005"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
 <repository location="http://download.eclipse.org/releases/mars"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/>
+<repository location="http://download.eclipse.org/tm/updates/4.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.native.feature.group" version="8.8.1.201602051005"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/8.8.1"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="2.0.2.201601261800"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones"/>
+</location>
 </locations>
 </target>
diff --git a/admin/target-defs/eclipse-4.6.x-neon.target b/admin/target-defs/eclipse-4.6.x-neon.target
index 0ecd7d31223..ddc1531360a 100644
--- a/admin/target-defs/eclipse-4.6.x-neon.target
+++ b/admin/target-defs/eclipse-4.6.x-neon.target
@@ -1,34 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.6.x (Neon)" sequenceNumber="104">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.6.x (Neon)" sequenceNumber="111">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-<repository location="http://download.eclipse.org/cbi/updates/license"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="gnu.io.rxtx.sdk.feature.group" version="2.1.7.4_v20071016-417C7DP1Bh_eEaQJBrHBHg"/>
 <repository location="http://archive.eclipse.org/tm/updates/rxtx"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.test.feature.group" version="3.7.100.v20160503-1715"/>
-<unit id="org.eclipse.sdk.ide" version="4.6.0.I20160606-1100"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.6.3.M20170301-0400"/>
+<unit id="org.eclipse.test.feature.group" version="3.7.100.v20170213-1316"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.0.201505221634"/>
-<repository location="http://download.eclipse.org/tm/updates/4.0"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jgit.feature.group" version="4.4.0.201606070830-r"/>
-<unit id="org.eclipse.egit.feature.group" version="4.4.0.201606070830-r"/>
-<unit id="org.eclipse.cdt.sdk.feature.group" version="9.0.0.201606062011"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.egit.feature.group" version="4.6.1.201703071140-r"/>
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.remote.feature.group" version="2.1.0.201605242106"/>
-<unit id="org.eclipse.remote.source.feature.group" version="2.1.0.201605242106"/>
-<repository location="http://download.eclipse.org/tools/ptp/builds/remote/2.1.0"/>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rse.feature.group" version="3.7.2.201610260947"/>
+<repository location="http://download.eclipse.org/tm/updates/4.2"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.native.feature.group" version="9.2.2.201704050430"/>
+<repository location="http://download.eclipse.org/tools/cdt/releases/9.2"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
+<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+<repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.feature.group" version="2.1.1.201612062149"/>
+<repository location="http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones"/>
 </location>
 </locations>
 </target>
diff --git a/admin/target-defs/eclipse-4.7.x-oxygen.target b/admin/target-defs/eclipse-4.7.x-oxygen.target
index 3ea17ed8d00..d916c122a14 100644
--- a/admin/target-defs/eclipse-4.7.x-oxygen.target
+++ b/admin/target-defs/eclipse-4.7.x-oxygen.target
@@ -19,23 +19,20 @@
 <repository location="http://download.eclipse.org/staging/oxygen"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rse.sdk.feature.group" version="3.7.3.201704251225"/>
+<unit id="org.eclipse.rse.feature.group" version="3.7.3.201704251225"/>
 <repository location="http://download.eclipse.org/tm/updates/4.3milestones"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.native.feature.group" version="9.3.0.201706051601"/>
-<unit id="org.eclipse.cdt.native.source.feature.group" version="9.3.0.201706051601"/>
 <repository location="http://download.eclipse.org/tools/cdt/builds/oxygen/milestones"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.commons.net" version="3.2.0.v201305141515"/>
-<unit id="org.apache.commons.net.source" version="3.2.0.v201305141515"/>
 <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
 <repository location="http://download.eclipse.org/tools/orbit/R-builds/R20170516192513/repository"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.feature.group" version="3.0.0.201706052031"/>
-<unit id="org.eclipse.remote.source.feature.group" version="3.0.0.201706052031"/>
 <repository location="http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones"/>
 </location>
 </locations>