diff --git a/releng/org.eclipse.tm.repo/category.xml b/releng/org.eclipse.tm.repo/category.xml
index 236e08816bd..7eee497c73f 100644
--- a/releng/org.eclipse.tm.repo/category.xml
+++ b/releng/org.eclipse.tm.repo/category.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.rse_3.5.0.qualifier.jar" id="org.eclipse.rse" version="3.5.0.qualifier">
+   <feature url="features/org.eclipse.rse_0.0.0.jar" id="org.eclipse.rse" version="0.0.0">
       <category name="tm_36_main"/>
    </feature>
-   <feature url="features/org.eclipse.rse.sdk_3.5.0.qualifier.jar" id="org.eclipse.rse.sdk" version="3.5.0.qualifier">
+   <feature url="features/org.eclipse.rse.sdk_0.0.0.jar" id="org.eclipse.rse.sdk" version="0.0.0">
       <category name="tm_36_main"/>
    </feature>
-   <feature url="features/org.eclipse.rse.useractions_1.1.500.qualifier.jar" id="org.eclipse.rse.useractions" version="1.1.500.qualifier">
+   <feature url="features/org.eclipse.rse.useractions_0.0.0.jar" id="org.eclipse.rse.useractions" version="0.0.0">
       <category name="tm_36_main"/>
    </feature>
-   <feature url="features/org.eclipse.rse.examples_3.1.400.qualifier.jar" id="org.eclipse.rse.examples" version="3.1.400.qualifier">
+   <feature url="features/org.eclipse.rse.examples_0.0.0.jar" id="org.eclipse.rse.examples" version="0.0.0">
       <category name="tm_36_optional"/>
    </feature>
-   <feature url="features/org.eclipse.rse.scp_0.2.100.qualifier.jar" id="org.eclipse.rse.scp" version="0.2.100.qualifier">
+   <feature url="features/org.eclipse.rse.scp_0.0.0.jar" id="org.eclipse.rse.scp" version="0.0.0">
       <category name="tm_36_optional"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.3.100.qualifier.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.3.100.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.local.sdk_0.0.0.jar" id="org.eclipse.tm.terminal.local.sdk" version="0.0.0">
       <category name="tm_36_optional"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.3.400.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.3.400.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.sdk_0.0.0.jar" id="org.eclipse.tm.terminal.sdk" version="0.0.0">
       <category name="tm_36_main"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.core.sdk_3.3.400.qualifier.jar" id="org.eclipse.tm.terminal.core.sdk" version="3.3.400.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.core.sdk_0.0.0.jar" id="org.eclipse.tm.terminal.core.sdk" version="0.0.0">
       <category name="tm_36_main"/>
    </feature>
    
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index 342e1c1c457..cceeb730dde 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse"
       label="%featureName"
-      version="3.5.0.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse-feature/pom.xml b/rse/features/org.eclipse.rse-feature/pom.xml
index 6d738d0af67..b49cb91f185 100644
--- a/rse/features/org.eclipse.rse-feature/pom.xml
+++ b/rse/features/org.eclipse.rse-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index 1555f4caaee..31aae7c9e9e 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.core"
       label="%featureName"
-      version="3.4.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.core"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.core-feature/pom.xml b/rse/features/org.eclipse.rse.core-feature/pom.xml
index 4fe025b2264..9d394aa4482 100644
--- a/rse/features/org.eclipse.rse.core-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.core-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core</artifactId>
-  <version>3.4.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.core.source/feature.xml b/rse/features/org.eclipse.rse.core.source/feature.xml
index 9d36574f189..f66257804c6 100644
--- a/rse/features/org.eclipse.rse.core.source/feature.xml
+++ b/rse/features/org.eclipse.rse.core.source/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.core.source"
       label="%featureName"
-      version="3.4.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -20,7 +20,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.core.source/pom.xml b/rse/features/org.eclipse.rse.core.source/pom.xml
index 0df06a7d2f3..f1d13baa54b 100644
--- a/rse/features/org.eclipse.rse.core.source/pom.xml
+++ b/rse/features/org.eclipse.rse.core.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.core.source</artifactId>
-  <version>3.4.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index edd8eb375df..fee30b974c8 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -19,7 +19,7 @@
 <feature
       id="org.eclipse.rse.dstore"
       label="%featureName"
-      version="3.4.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.dstore"
       license-feature="org.eclipse.license"
@@ -38,7 +38,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.dstore-feature/pom.xml b/rse/features/org.eclipse.rse.dstore-feature/pom.xml
index e6fa2e6b945..f94cdbb7458 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.dstore</artifactId>
-  <version>3.4.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.dstore.source/feature.xml b/rse/features/org.eclipse.rse.dstore.source/feature.xml
index ae820ba16cf..8bda446325d 100644
--- a/rse/features/org.eclipse.rse.dstore.source/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore.source/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rse.dstore.source"
       label="%featureName"
-      version="3.4.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/rse/features/org.eclipse.rse.dstore.source/pom.xml b/rse/features/org.eclipse.rse.dstore.source/pom.xml
index d88553e8ae0..2f207a38869 100644
--- a/rse/features/org.eclipse.rse.dstore.source/pom.xml
+++ b/rse/features/org.eclipse.rse.dstore.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.dstore.source</artifactId>
-  <version>3.4.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index 620ea4bd13e..de031dd856d 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.ftp"
       label="%featureName"
-      version="3.2.0.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.files.ftp"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.ftp-feature/pom.xml b/rse/features/org.eclipse.rse.ftp-feature/pom.xml
index d7c87afcb7c..15e0b2884b2 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ftp</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.ftp.source/feature.xml b/rse/features/org.eclipse.rse.ftp.source/feature.xml
index bcdd45562ab..54b9b6ae30e 100644
--- a/rse/features/org.eclipse.rse.ftp.source/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp.source/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.ftp.source"
       label="%featureName"
-      version="3.2.0.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.files.ftp.source"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.ftp.source/pom.xml b/rse/features/org.eclipse.rse.ftp.source/pom.xml
index 260e36307bc..e9d234c16c9 100644
--- a/rse/features/org.eclipse.rse.ftp.source/pom.xml
+++ b/rse/features/org.eclipse.rse.ftp.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ftp.source</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index d366779383c..e972b06fb9a 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.local"
       label="%featureName"
-      version="2.1.500.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.local"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.local-feature/pom.xml b/rse/features/org.eclipse.rse.local-feature/pom.xml
index 5dff5825031..4b34c04092b 100644
--- a/rse/features/org.eclipse.rse.local-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.local-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.local</artifactId>
-  <version>2.1.500-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.local.source/feature.xml b/rse/features/org.eclipse.rse.local.source/feature.xml
index e26c8b079e8..cedab5e0e02 100644
--- a/rse/features/org.eclipse.rse.local.source/feature.xml
+++ b/rse/features/org.eclipse.rse.local.source/feature.xml
@@ -1,23 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.rse.local.source" version="2.1.500.qualifier" label="%featureName" provider-name="%providerName"     
-	license-feature="org.eclipse.license"
-	license-feature-version="1.0.1.qualifier">
-	<description >
-		%description
-	</description>
-	<copyright>
-		%copyright
-	</copyright>
-	<license url="%licenseURL">
-		%license
-	</license>
-	<url>
-		<update url="http://download.eclipse.org/tm/updates/3.5" label="%tmUpdateSiteName"/>
-		<discovery url="http://download.eclipse.org/tm/updates/3.5" label="%tmUpdateSiteName"/>
-	</url>
-	<plugin id="org.eclipse.rse.services.local.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.subsystems.files.local.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.subsystems.processes.local.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.subsystems.shells.local.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.connectorservice.local.source" version="0.0.0"     unpack="false"/>
+<feature
+      id="org.eclipse.rse.local.source"
+      label="%featureName"
+      version="3.6.1.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.rse.services.local.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.files.local.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.processes.local.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.shells.local.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.connectorservice.local.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/rse/features/org.eclipse.rse.local.source/pom.xml b/rse/features/org.eclipse.rse.local.source/pom.xml
index f65f9b32c25..51f8995012d 100644
--- a/rse/features/org.eclipse.rse.local.source/pom.xml
+++ b/rse/features/org.eclipse.rse.local.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.local.source</artifactId>
-  <version>2.1.500-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.scp-feature/feature.xml b/rse/features/org.eclipse.rse.scp-feature/feature.xml
index 715011db611..a7625eaad18 100644
--- a/rse/features/org.eclipse.rse.scp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.scp-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.rse.scp"
       label="%featureName"
-      version="0.2.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.subsystems.files.scp"
       image="eclipse_update_120.jpg"
@@ -33,7 +33,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.scp-feature/pom.xml b/rse/features/org.eclipse.rse.scp-feature/pom.xml
index 6652afb0c37..3363f635f24 100644
--- a/rse/features/org.eclipse.rse.scp-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.scp-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.scp</artifactId>
-  <version>0.2.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index b298923b851..36f07585545 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.sdk"
       label="%featureName"
-      version="3.5.0.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.sdk-feature/pom.xml b/rse/features/org.eclipse.rse.sdk-feature/pom.xml
index 9db47c76595..2c10601aca0 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.sdk</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index 96d85319b5c..54b75f81c97 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.ssh"
       label="%featureName"
-      version="3.0.500.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.ssh"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.ssh-feature/pom.xml b/rse/features/org.eclipse.rse.ssh-feature/pom.xml
index da5d4bd3b7a..17ebbf247ff 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ssh</artifactId>
-  <version>3.0.500-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.ssh.source/feature.xml b/rse/features/org.eclipse.rse.ssh.source/feature.xml
index 8f5a1c9c165..ab5b2aa304b 100644
--- a/rse/features/org.eclipse.rse.ssh.source/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh.source/feature.xml
@@ -1,22 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.rse.ssh.source" version="3.0.500.qualifier" label="%featureName" provider-name="%providerName" 
-	license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier"	>
-	<description >
-		%description
-	</description>
-	<copyright >
-		%copyright
-	</copyright>
-	<license url="%licenseURL">
-		%license
-	</license>
-	<url>
-		<update url="http://download.eclipse.org/tm/updates/3.5" label="%tmUpdateSiteName"/>
-		<discovery url="http://download.eclipse.org/tm/updates/3.5" label="%tmUpdateSiteName"/>
-	</url>
-	<plugin id="org.eclipse.rse.services.ssh.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.connectorservice.ssh.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.subsystems.files.ssh.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.subsystems.shells.ssh.source" version="0.0.0"     unpack="false"/>
+<feature
+      id="org.eclipse.rse.ssh.source"
+      label="%featureName"
+      version="3.6.1.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.rse.services.ssh.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.connectorservice.ssh.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.files.ssh.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.shells.ssh.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/rse/features/org.eclipse.rse.ssh.source/pom.xml b/rse/features/org.eclipse.rse.ssh.source/pom.xml
index 946001dc0dc..32c64710717 100644
--- a/rse/features/org.eclipse.rse.ssh.source/pom.xml
+++ b/rse/features/org.eclipse.rse.ssh.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.ssh.source</artifactId>
-  <version>3.0.500-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index 97fb84bac65..0f3d8210ea5 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.telnet"
       label="%featureName"
-      version="2.3.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.telnet"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.telnet-feature/pom.xml b/rse/features/org.eclipse.rse.telnet-feature/pom.xml
index 69238d24899..ac82ee3200a 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.telnet</artifactId>
-  <version>2.3.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.telnet.source/feature.xml b/rse/features/org.eclipse.rse.telnet.source/feature.xml
index 1cb4598ec52..d736e5874ad 100644
--- a/rse/features/org.eclipse.rse.telnet.source/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet.source/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.telnet.source"
       label="%featureName"
-      version="2.3.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.telnet.source"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.telnet.source/pom.xml b/rse/features/org.eclipse.rse.telnet.source/pom.xml
index 06052b54b6e..b465ad14adc 100644
--- a/rse/features/org.eclipse.rse.telnet.source/pom.xml
+++ b/rse/features/org.eclipse.rse.telnet.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.telnet.source</artifactId>
-  <version>2.3.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.terminals-feature/feature.xml b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
index 1d786a6f9cc..f4b6a89ec88 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.terminals"
       label="%featureName"
-      version="1.2.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.terminals.ui"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.terminals-feature/pom.xml b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
index 919154df753..8ee3b306cc5 100644
--- a/rse/features/org.eclipse.rse.terminals-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.terminals-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.terminals</artifactId>
-  <version>1.2.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.terminals.source/feature.xml b/rse/features/org.eclipse.rse.terminals.source/feature.xml
index ca4692493e7..1f077ca1512 100644
--- a/rse/features/org.eclipse.rse.terminals.source/feature.xml
+++ b/rse/features/org.eclipse.rse.terminals.source/feature.xml
@@ -1,21 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.eclipse.rse.terminals.source" version="1.2.100.qualifier" label="%featureName" provider-name="%providerName" image="eclipse_update_120.jpg"
-	license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier"	>
-	<description >
-		%description
-	</description>
-	<copyright >
-		%copyright
-	</copyright>
-	<license url="%licenseURL">
-		%license
-	</license>
-	<url>
-		<update url="http://download.eclipse.org/tm/updates/3.5" label="%tmUpdateSiteName"/>
-		<discovery url="http://download.eclipse.org/tm/updates/3.5" label="%tmUpdateSiteName"/>
-	</url>
-	<plugin id="org.eclipse.rse.subsystems.terminals.core.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.subsystems.terminals.ssh.source" version="0.0.0"     unpack="false"/>
-	<plugin id="org.eclipse.rse.terminals.ui.source" version="0.0.0"     unpack="false"/>
+<feature
+      id="org.eclipse.rse.terminals.source"
+      label="%featureName"
+      version="3.6.1.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
+      <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+   </url>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.terminals.core.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.terminals.ssh.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.terminals.ui.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/rse/features/org.eclipse.rse.terminals.source/pom.xml b/rse/features/org.eclipse.rse.terminals.source/pom.xml
index cd124441313..1d4b6aff20a 100644
--- a/rse/features/org.eclipse.rse.terminals.source/pom.xml
+++ b/rse/features/org.eclipse.rse.terminals.source/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.terminals.source</artifactId>
-  <version>1.2.100-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.useractions-feature/feature.xml b/rse/features/org.eclipse.rse.useractions-feature/feature.xml
index b68e6777387..2daa4b3858a 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.useractions"
       label="%featureName"
-      version="1.1.500.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.useractions"
       image="eclipse_update_120.jpg"
@@ -32,7 +32,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.useractions-feature/pom.xml b/rse/features/org.eclipse.rse.useractions-feature/pom.xml
index a7fc7be7bd3..db2fe661417 100644
--- a/rse/features/org.eclipse.rse.useractions-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.useractions-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.useractions</artifactId>
-  <version>1.1.500-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
index 9c60e6121e8..151b54bca51 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.rse.useractions.sdk"
       label="%featureName"
-      version="3.5.0.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
@@ -31,7 +31,7 @@
    </license>
 
    <url>
-      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
+      <update label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.6"/>
       <discovery label="%tmUpdateSiteName" url="http://download.eclipse.org/tm/updates/3.5"/>
    </url>
 
diff --git a/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml b/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
index 83e71a5cefc..b09f687e9ec 100644
--- a/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
+++ b/rse/features/org.eclipse.rse.useractions.sdk-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.rse.useractions.sdk</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>3.6.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
index a246ac6dd44..d227a5f0a0a 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal"
       label="%featureName"
-      version="3.2.400.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
index 69271374f86..c012929912b 100644
--- a/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal</artifactId>
-  <version>3.2.400.qualifier</version>
+  <version>3.6.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
index 83ecbe15e11..ad8394363fc 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.core.sdk"
       label="%featureName"
-      version="3.3.400.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
index 51103214443..ec5e20b489e 100644
--- a/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.core.sdk-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.core.sdk</artifactId>
-  <version>3.3.400.qualifier</version>
+  <version>3.6.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
index 03dc1e8dbbf..b8d56f6212e 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.local"
       label="%featureName"
-      version="0.2.300.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
index ceacdfbd019..0e0f050a87e 100644
--- a/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local</artifactId>
-  <version>0.2.300.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
index bf5ff255c2e..6a3a3b74015 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.local.sdk"
       label="%featureName"
-      version="0.3.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
index 124b1b2a7b1..50081855ce6 100644
--- a/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.local.sdk-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.local.sdk</artifactId>
-  <version>0.3.100.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
index c857515f844..1cd7ba752bf 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="3.3.400.qualifier"
+      version="3.6.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
index 2bb2c6455e4..b634951649e 100644
--- a/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.sdk-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.sdk</artifactId>
-  <version>3.3.400.qualifier</version>
+  <version>3.6.100.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
index 5f125c73fee..01f5889e74d 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.serial"
       label="%featureName"
-      version="2.1.300.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
index 5189aa953fd..83890ae7295 100644
--- a/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.serial-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.serial</artifactId>
-  <version>2.1.300.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
index 0e5de69b520..27e7f08d948 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.ssh"
       label="%featureName"
-      version="2.1.300.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
index 95aaf1c561b..ad27909c100 100644
--- a/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.ssh-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.ssh</artifactId>
-  <version>2.1.300.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
index 924a93a9e91..de9b38755f1 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.telnet"
       label="%featureName"
-      version="2.1.300.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
index 79b3e89ca3f..cb5bf56cec5 100644
--- a/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.telnet-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.telnet</artifactId>
-  <version>2.1.300.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
index 582c78ea22e..b7156025af6 100644
--- a/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.test-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.test"
       label="%featureName"
-      version="2.1.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
index 5a22c01ddf7..bb0c74b46c8 100644
--- a/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.test-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.test</artifactId>
-  <version>2.1.100.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
index cb0e3f09c4b..3371b38c9c8 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -14,7 +14,7 @@
 <feature
       id="org.eclipse.tm.terminal.view"
       label="%featureName"
-      version="2.4.100.qualifier"
+      version="3.6.1.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
diff --git a/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml b/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
index 6a4956f47e6..a74df51b22f 100644
--- a/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
+++ b/terminal/features/org.eclipse.tm.terminal.view-feature/pom.xml
@@ -10,6 +10,21 @@
   </parent>
   <groupId>org.eclipse.tm.features</groupId>
   <artifactId>org.eclipse.tm.terminal.view</artifactId>
-  <version>2.4.100.qualifier</version>
+  <version>3.6.1.qualifier</version>
   <packaging>eclipse-feature</packaging>
+  
+  <build>
+  	<pluginManagement>
+  		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<timestampProvider>default</timestampProvider>
+				</configuration>
+			</plugin>
+  		</plugins>
+  	</pluginManagement>
+  </build>
 </project>
diff --git a/terminal/plugins/org.eclipse.tm.terminal/plugin.properties b/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
index c239a2a2bd2..6db51558ef0 100644
--- a/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
+++ b/terminal/plugins/org.eclipse.tm.terminal/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2012 Wind River Systems, Inc. and others.
+# Copyright (c) 2003, 2012, 2014 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -34,6 +34,8 @@ terminal.view.insertion.description = Terminal view commands
 
 terminal.command.copy.name=Copy
 terminal.command.paste.name=Paste
+terminal.command.maximize.name=Maximize Active View or Editor
+terminal.command.quickaccess.name=Quick Access
 
 terminal.preferences.name = Terminal
 terminal.font.description = The font for the terminal console.
diff --git a/terminal/plugins/org.eclipse.tm.terminal/plugin.xml b/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
index d9ea23975d4..1ec047e252e 100644
--- a/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
+++ b/terminal/plugins/org.eclipse.tm.terminal/plugin.xml
@@ -50,6 +50,15 @@
             categoryId="org.eclipse.tm.terminal.category1"
             id="org.eclipse.tm.terminal.paste"
             name="%terminal.command.paste.name"/>
+      <command
+            categoryId="org.eclipse.tm.terminal.category1"
+            id="org.eclipse.tm.terminal.maximize"
+            name="%terminal.command.maximize.name">
+      </command>
+      <command
+            categoryId="org.eclipse.tm.terminal.category1"
+            id="org.eclipse.tm.terminal.quickaccess"
+            name="%terminal.command.quickaccess.name"/>
       <category
             description="%terminal.view.insertion.description"
             id="org.eclipse.tm.terminal.category1"
@@ -217,13 +226,15 @@
            since these are extremely valuable, but the original shortcut may need
            to go to the Terminal.
       -->
+      <!-- org.eclipse.ui.window.quickAccess -->
       <key
-            commandId="org.eclipse.ui.window.quickAccess"
+            commandId="org.eclipse.tm.terminal.quickaccess"
             contextId="org.eclipse.tm.terminal.EditContext"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M3+ARROW_RIGHT"/>
+      <!-- org.eclipse.ui.window.maximizePart -->
       <key
-            commandId="org.eclipse.ui.window.maximizePart"
+            commandId="org.eclipse.tm.terminal.maximize"
             contextId="org.eclipse.tm.terminal.EditContext"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="M3+ARROW_UP"/>