diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map
index eaff08c78d5..d9e3555daf4 100644
--- a/releng/org.eclipse.tm.releng/maps/rse.map
+++ b/releng/org.eclipse.tm.releng/maps/rse.map
@@ -8,7 +8,7 @@ feature@org.eclipse.rse.ftp=v201005221100,:pserver:anonymous:none@dev.eclipse.or
 feature@org.eclipse.rse.local=v201011250834,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
 feature@org.eclipse.rse.sdk=v201010061330,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
 feature@org.eclipse.rse.ssh=v201101030012,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.ssh-feature
-feature@org.eclipse.rse.telnet=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
+feature@org.eclipse.rse.telnet=v201101031815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.telnet-feature
 feature@org.eclipse.rse.terminals=v201101030012,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.terminals-feature
 feature@org.eclipse.rse.tests=v201101030012,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests-feature
 feature@org.eclipse.rse.useractions=v201005221100,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/features/org.eclipse.rse.useractions-feature
@@ -51,10 +51,10 @@ plugin@org.eclipse.rse.subsystems.processes.dstore=v200905272300,:pserver:anonym
 plugin@org.eclipse.rse.subsystems.processes.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
 plugin@org.eclipse.rse.subsystems.processes.shell.linux=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.shell.linux
 plugin@org.eclipse.rse.subsystems.shells.core=v201003010830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v201008191400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.subsystems.shells.ssh=v201101030012,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
-plugin@org.eclipse.rse.subsystems.shells.telnet=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
+plugin@org.eclipse.rse.subsystems.shells.dstore=v201101031815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
+plugin@org.eclipse.rse.subsystems.shells.local=v201101031815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
+plugin@org.eclipse.rse.subsystems.shells.ssh=v201101031815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
+plugin@org.eclipse.rse.subsystems.shells.telnet=v201101031815,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
 plugin@org.eclipse.rse.subsystems.terminals.core=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.core
 plugin@org.eclipse.rse.subsystems.terminals.ssh=v201101030012,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.terminals.ssh
 plugin@org.eclipse.rse.terminals.ui=v201006041352,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/tools,,org.eclipse.tm.rse/plugins/org.eclipse.rse.terminals.ui
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index d1efd4fda00..77d20bcb745 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
      Copyright (c) 2005, 2010 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
@@ -8,11 +9,10 @@
      Contributors:
          IBM Corporation - initial API and implementation
  -->
-
 <feature
       id="org.eclipse.rse.telnet"
       label="%featureName"
-      version="2.2.100.qualifier"
+      version="2.2.200.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.telnet">
 
diff --git a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
index a0bf68348bd..2ac6839c5b1 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/sourceTemplateFeature/feature.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
      Copyright (c) 2005, 2010 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
@@ -8,11 +9,10 @@
      Contributors:
          IBM Corporation - initial API and implementation
  -->
-
 <feature
       id="org.eclipse.rse.telnet.source"
       label="%featureName"
-      version="2.2.100.qualifier"
+      version="2.2.200.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rse.services.telnet.source">
 
@@ -40,8 +40,25 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin id="org.eclipse.rse.connectorservice.telnet.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-   <plugin id="org.eclipse.rse.services.telnet.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-   <plugin id="org.eclipse.rse.subsystems.shells.telnet.source" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin
+         id="org.eclipse.rse.connectorservice.telnet.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.services.telnet.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.rse.subsystems.shells.telnet.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
index 438e097f34b..e1595351da3 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.dstore;singleton:=true
-Bundle-Version: 2.1.201.qualifier
+Bundle-Version: 2.1.300.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.dstore.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties
index b3c717ec953..9f88eb07d10 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.dstore/build.properties
@@ -17,3 +17,4 @@ bin.includes = META-INF/,\
 source.. = src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.core.resources
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
index 536dcf359ba..8042ebd782d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.local;singleton:=true
-Bundle-Version: 2.1.100.qualifier
+Bundle-Version: 2.1.300.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.local.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties
index 8a94f8ec653..e059ec6788c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/build.properties
@@ -17,3 +17,4 @@ bin.includes = META-INF/,\
 source.. = src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.core.resources
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
index 86caaa2de70..292ffccdb5d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.ssh; singleton:=true
-Bundle-Version: 2.1.200.qualifier
+Bundle-Version: 2.1.300.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.ssh.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/build.properties
index 8a94f8ec653..e059ec6788c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/build.properties
@@ -17,3 +17,4 @@ bin.includes = META-INF/,\
 source.. = src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.core.resources
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
index b72a82eacfb..1cafe853db8 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rse.subsystems.shells.telnet;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.2.200.qualifier
 Bundle-Activator: org.eclipse.rse.internal.subsystems.shells.telnet.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/build.properties b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/build.properties
index b0b0052b0e3..7078047369e 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/build.properties
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/build.properties
@@ -17,3 +17,4 @@ bin.includes = .,\
 source.. = src/
 output.. = bin/
 src.includes = about.html
+additional.bundles = org.eclipse.core.resources