diff --git a/.gitignore b/.gitignore
index 6d21f732c9b..0751d5c9ae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,17 @@
-bin/
-target/
-workspace/
-debug-workspace/
-
 # ignore various emacs droppings
 *~
 \#*\#
 
+# .
+workspace
+debug-workspace
+
+# Ignored throughout the whole tree
+bin/
+target/
+coverage/
+artifacts/
+/ManifestValidationResult.html
+
 # MacOSX
 .DS_Store
diff --git a/admin/pom-config.xml b/admin/pom-config.xml
index 255f285932b..168a613f0a3 100644
--- a/admin/pom-config.xml
+++ b/admin/pom-config.xml
@@ -37,9 +37,11 @@
     
     <properties>
         <!-- Define version id's to be used in the plugins section -->
-        <!-- We stick to tycho-0.22 since it supports Java 7 for building -->
+        <!-- We use tycho-0.23 for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459873 -->
+        <!-- We cannot use tycho-0.25 or later since it doesn't support Java 7 for building -->
+        <!-- Using Java 8 for Tycho with a Java 7 target should be possible but takes some config -->
         <!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
-        <tycho-version>0.22.0</tycho-version>
+        <tycho-version>0.23.1</tycho-version>
         <tycho-extras-version>${tycho-version}</tycho-extras-version>
         <maven-resources-version>2.7</maven-resources-version>
         <maven-antrun-version>1.8</maven-antrun-version>
@@ -59,11 +61,11 @@
         <jacoco.output>file</jacoco.output>
         <jacoco.dumpOnExit>true</jacoco.dumpOnExit>
 
-        <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
-
         <terminal-stream>development</terminal-stream>
         <terminal-zipfile>${project.artifactId}.zip</terminal-zipfile>
         <terminal-install>/home/data/httpd/download.eclipse.org/tm/terminal/builds/${terminal-stream}/nightly</terminal-install>
+        <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
+
         <sdk-version>4.7</sdk-version>
         
         <!-- Set up Mars as the default target platform to build against, -->
@@ -76,10 +78,13 @@
         <tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
         <remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
         <rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
-        <!--  SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer -->
-        <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/</orbit-site>
-        <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.5.0/</swtbot-site>
-      </properties>
+        <!-- TCF needs gson-2.2.4 which was added to Orbit in Luna SR2 -->
+        <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/</orbit-site>
+        <!-- SWTBot-2.4 and later require an e4-based Eclipse eg Juno or later: -->
+        <!-- See http://wiki.eclipse.org/SWTBot/Releases -->
+        <!-- Also, newer SWTBot needs JUnit 4.12 which is only in Orbit Mars and newer -->
+        <swtbot-site>http://download.eclipse.org/technology/swtbot/releases/2.2.1/</swtbot-site>
+    </properties>
 
     <repositories>
         <repository>
diff --git a/admin/target-defs/eclipse-3.8.2-juno.target b/admin/target-defs/eclipse-3.8.2-juno.target
index ab159a75f0e..4a30c3cd2b9 100644
--- a/admin/target-defs/eclipse-3.8.2-juno.target
+++ b/admin/target-defs/eclipse-3.8.2-juno.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 3.8.x (Juno)" sequenceNumber="41">
+<?pde version="3.8"?><target name="Terminals Eclipse 3.8.x (Juno)" sequenceNumber="47">
 <locations>
 <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"/>
@@ -20,10 +20,10 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.swtbot.forms.feature.group" version="2.5.0.201609021837"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.5.0.201609021837"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="2.2.1.201402241301"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.2.1.201402241301"/>
 <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
 <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
 <repository location="http://download.eclipse.org/technology/swtbot/releases/2.5.0"/>
@@ -39,7 +39,7 @@
 <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/"/>
+<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="2.0.0.201507010000"/>
diff --git a/admin/target-defs/eclipse-4.3.x-kepler.target b/admin/target-defs/eclipse-4.3.x-kepler.target
index 829a8a022ce..00ff47c0d91 100644
--- a/admin/target-defs/eclipse-4.3.x-kepler.target
+++ b/admin/target-defs/eclipse-4.3.x-kepler.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Eclipse 4.3.x (Kepler)" sequenceNumber="38">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.3.x (Kepler)" sequenceNumber="39">
 <locations>
 <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"/>
diff --git a/admin/target-defs/eclipse-4.7.x-oxygen.target b/admin/target-defs/eclipse-4.7.x-oxygen.target
index d3ed1463ba7..d679b08cf1b 100644
--- a/admin/target-defs/eclipse-4.7.x-oxygen.target
+++ b/admin/target-defs/eclipse-4.7.x-oxygen.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Terminals Eclipse 4.7.x (Oxygen)" sequenceNumber="14">
+<?pde version="3.8"?><target name="Terminals Eclipse 4.7.x (Oxygen)" sequenceNumber="27">
 <locations>
 <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"/>