diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index f1995f09dc0..d01146467fe 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -29,7 +29,7 @@
   Discovery needs EMF, and the RemoteCDT integration needs CDT.</li>
 <li>Important Bug Fixes, Enhancements and API changes:<ul>
 <li>API: A new <b><a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.isv/reference/extension-points/org_eclipse_rse_services_codePageConverters.html">
-  CodePageConverters</a></b> extension point has been added to support services
+  codePageConverters</a></b> extension point has been added to support services
   that need to perform special additional conversions on encodings
   [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=209704">209704</a>].</li>
 <li><b>Archive Handling</b> has been improved to run outside the dispatch thread on the
@@ -44,7 +44,9 @@
   default encoding. This allows for external tools to easily perform operations on remote
   files which are in uncommon encodings
   [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=210812">210812</a>].</li>
-<li>API: An extension point has been added to specify the default file transfer mode (binary/ascii) for a specific filetype
+<li>API: The <b><a href="http://dsdp.eclipse.org/help/latest/index.jsp?topic=/org.eclipse.rse.doc.isv/reference/extension-points/org_eclipse_rse_subsystems_files_core_remoteFileTypes.html">
+  remoteFileTypes</a></b> extension point has been added to specify the default file transfer mode
+  (binary/ascii) for a specific file type
   [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208951">208951</a>].</li>
 <li>Remote file encoding now defaults to the parent folder encoding
   [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=209660">209660</a>].</li>
@@ -135,6 +137,19 @@ More information can be found in the associated bugzilla items.
 <ul>
 <li>TM @buildId@ Breaking API Changes
 <ul>
+<li><b><a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/core/subsystems/IRemoteObjectResolver.html#getObjectWithAbsoluteName(java.lang.String,%20org.eclipse.core.runtime.IProgressMonitor)">
+    IRemoteObjectResolver.getObjectWithAbsoluteName()</a></b>
+    now takes an additional <tt>IProgressMonitor</tt> parameter, in order to support cancellation of deferred queries.
+    The old method has been deprecated and will be removed for 3.0. Especially custom <b>Subsystem</b> implementations will need to 
+    be changed to implement the new method instead of the old one
+    [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=211472">211472</a>].</li>
+<li><b><a href="http://dsdp.eclipse.org/help/latest/topic/org.eclipse.rse.doc.isv/reference/api/org/eclipse/rse/services/files/IFileService.html#getOutputStream(java.lang.String,%20java.lang.String,%20boolean,%20int,%20org.eclipse.core.runtime.IProgressMonitor)">
+    IFileService.getOutputStream()</a></b>
+    now takes an additional <tt>int options</tt> parameter, in order to support opening streams which append
+    to existing files. This was required in order to properly fulfill the EFS APIs. The corresponding old
+    method has been deprecated and will be removed for 3.0. Custom File Service implementations should be
+    changed to implement the new method instead of the old one
+    [<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208778">208778</a>].</li>
 <li><b>Removed</b> the now obsolete IFileService.list(...) methods in favor of the new API
     from <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=207178">bug 207178</a>.
     Clients of IRemoteFileSubSystem and IFileService need to be changed, though the change
@@ -205,7 +220,7 @@ We'll strive to fix these as soon as possible.
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198143">bug 198143</a> - maj - [dstore][performance] Refresh a big directory takes very long time, and freezes workbench</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=198395">bug 198395</a> - maj - [dstore] Can connect to DStore with expired password</li>
   <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=203501">bug 203501</a> - maj - NPE in PFMetadataLocation when saving RSEDOM</li>
-  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208778">bug 208778</a> - maj - [efs][api] RSEFileStore#getOutputStream() does not support EFS#APPEND</li>
+  <li><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=208185">bug 208185</a> - maj - [terminal][serial] terminal can hang the UI when text is entered while the backend side is not reading characters</li>
 </ul>
 <!--
 <p>No major or critical bugs are known at the time of release.
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/schema/remoteFileTypes.exsd b/rse/plugins/org.eclipse.rse.subsystems.files.core/schema/remoteFileTypes.exsd
index c15720707bb..dd4da888887 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.core/schema/remoteFileTypes.exsd
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/schema/remoteFileTypes.exsd
@@ -3,7 +3,7 @@
 <schema targetNamespace="org.eclipse.rse.subsystems.files.core">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.rse.subsystems.files.core" id="remoteFileTypes" name="%extPoint.remoteFileTypes"/>
+         <meta.schema plugin="org.eclipse.rse.subsystems.files.core" id="remoteFileTypes" name="Remote File Types"/>
       </appInfo>
       <documentation>
          This extension point is used to register information about whether particular file types should be considered text or binary. This information is important as it will determine how files will be transferred.
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.properties b/rse/plugins/org.eclipse.rse.ui/plugin.properties
index 204d18c1e30..e0d190eebc6 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.properties
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.properties
@@ -24,7 +24,7 @@
 pluginName = RSE UI
 providerName = Eclipse.org
 
-extPoint.newConnectionWizard = New Connection Wizard
+extPoint.newConnectionWizards = New Connection Wizards
 #extPoint.compile = Remote Compile Commands
 extPoint.mountPathMappers = Mount Path Mappers
 
diff --git a/rse/plugins/org.eclipse.rse.ui/plugin.xml b/rse/plugins/org.eclipse.rse.ui/plugin.xml
index 2c0f9a5b150..e16ce0ada35 100644
--- a/rse/plugins/org.eclipse.rse.ui/plugin.xml
+++ b/rse/plugins/org.eclipse.rse.ui/plugin.xml
@@ -312,7 +312,7 @@ Martin Oberhuber (Wind River) - [185552] Remove remoteSystemsViewPreferencesActi
 <!-- ================================================================= -->
 <!-- 		Define newConnectionWizards extension point				   -->
 <!-- ================================================================= -->
-   <extension-point id="newConnectionWizards" name="%extPoint.newConnectionWizard" schema="schema/newConnectionWizards.exsd"/>
+   <extension-point id="newConnectionWizards" name="%extPoint.newConnectionWizards" schema="schema/newConnectionWizards.exsd"/>
 
 <!-- ================================================================= -->
 <!-- Define the Drop Actions                                           -->
diff --git a/rse/plugins/org.eclipse.rse.ui/rseprofile.xsd b/rse/plugins/org.eclipse.rse.ui/rseprofile.xsd
deleted file mode 100644
index 9cdfe618bcf..00000000000
--- a/rse/plugins/org.eclipse.rse.ui/rseprofile.xsd
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:	xs="http://www.w3.org/2001/XMLSchema"
-				 	targetNamespace="org.eclipse.rse.core"
-				 	xmlns="org.eclipse.rse.core"
-					elementFormDefault="qualified">
-
-<!-- Common attributes -->
- <xs:attribute name="name" type="xs:string"/>
- <xs:attribute name="type" type="xs:string"/>
-
-<!-- Filter string attributes -->
- <xs:attribute name="string" type="xs:string"/>
-
-<!-- Filter attributes -->
- <xs:attribute name="supportsNestedFilters" type="xs:boolean"/>
- <xs:attribute name="relativeOrder" type="xs:integer"/>
- <xs:attribute name="default" type="xs:boolean"/>
- <xs:attribute name="stringsCaseSensitive" type="xs:boolean"/>
- <xs:attribute name="promptable" type="xs:boolean"/>
- <xs:attribute name="supportsDuplicateFilterStrings" type="xs:boolean"/>
- <xs:attribute name="nonDeletable" type="xs:boolean"/>
- <xs:attribute name="nonRenamable" type="xs:boolean"/>
- <xs:attribute name="nonChangable" type="xs:boolean"/>
- <xs:attribute name="stringsNonChangable" type="xs:boolean"/>
- <xs:attribute name="release" type="xs:integer"/>
- <xs:attribute name="singleFilterStringOnly" type="xs:boolean"/>
-
-<!-- FilterPool attributes -->
- <xs:attribute name="deletable" type="xs:boolean"/>
- <xs:attribute name="owningParentName" type="xs:string"/>
- <xs:attribute name="id" type="xs:ID"/>
-
-<!-- FilterPoolReference attributes -->
- <xs:attribute name="refID" type="xs:IDREF"/>
-
-<!-- Host attributes -->
- <xs:attribute name="offline" type="xs:boolean"/>
- <xs:attribute name="hostName" type="xs:string"/>
- <xs:attribute name="description" type="xs:string"/>
- <xs:attribute name="defaultUserId" type="xs:string"/>
-
-<!-- Profile attributes -->
- <xs:attribute name="defaultPrivate" type="xs:boolean"/>
- <xs:attribute name="isActive" type="xs:boolean"/>
-
-<!-- SubSystem attributes -->
- <xs:attribute name="hidden" type="xs:boolean"/>
-
-<!-- RemoteFileSubSystem attributes -->
- <xs:attribute name="homeFolder" type="xs:string"/>
-
-<!-- ConnectorService attributes -->
- <xs:attribute name="group" type="xs:string"/>
- <xs:attribute name="useSSL" type="xs:boolean"/>
-
-<!-- Property attributes -->
- <xs:attribute name="key" type="xs:string"/>
- <xs:attribute name="value" type="xs:string"/>
-
-
-
-<!-- Property definition -->
- <xs:complexType name="Property">
-   <xs:attribute ref="key" use="required"/>
-   <xs:attribute ref="value" use="required"/>   
- </xs:complexType>
-
-<!-- PropertySet definition -->
- <xs:complexType name="PropertySet">
-  <xs:attribute ref="name" use="required"/>
-  <xs:element name="Property" type="Property" maxOccurs="unbounded" minOccurs="0"/>  	
- </xs:complexType>
-
-<!-- EnvironmentVariable definition -->
- <xs:complexType name="EnvironmentVariable">
-   <xs:attribute ref="name" use="required"/>
-   <xs:attribute ref="value" use="required"/>
-   <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="1"/> 
- </xs:complexType>
-
-<!-- FilterString definition -->
- <xs:complexType name="FilterString">
-  <xs:attribute ref="string" use="required"/>
-  <xs:attribute ref="type" use="required"/>
-  <xs:attribute ref="default" use="required"/>
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-<!-- Filter definition -->
- <xs:complexType name="Filter">
-  <xs:attribute ref="name" use="required"/>
-  <xs:attribute ref="type" use="required"/>
-  <xs:attribute ref="supportsNestedFilters" use="required"/>
-  <xs:attribute ref="relativeOrder" use="required"/>
-  <xs:attribute ref="default" use="required"/>
-  <xs:attribute ref="stringsCaseSensitive" use="optional"/>
-  <xs:attribute ref="promptable" use="required"/>
-  <xs:attribute ref="supportsDuplicateFilterStrings" use="required"/>
-  <xs:attribute ref="nonDeletable" use="required"/>
-  <xs:attribute ref="nonRenamable" use="required"/>
-  <xs:attribute ref="nonChangable" use="required"/>
-  <xs:attribute ref="stringsNonChangable" use="required"/>
-  <xs:attribute ref="release" use="required"/>
-  <xs:attribute ref="singleFilterStringOnly" use="optional"/>
-  <xs:element name="Filter" type="Filter" maxOccurs="unbounded" minOccurs="0"/>
-  <xs:element name="FilterString" type="FilterString" maxOccurs="unbounded" minOccurs="0"/>
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-<!-- FilterPool definition -->
- <xs:complexType name="FilterPool">
-  <xs:attribute ref="name" use="required"/>
-  <xs:attribute ref="type" use="required"/>
-  <xs:attribute ref="id" use="required"/>  
-  <xs:attribute ref="supportsNestedFilters" use="required"/>
-  <xs:attribute ref="deletable" use="required"/>
-  <xs:attribute ref="default" use="required"/>
-  <xs:attribute ref="stringsCaseSensitive" use="optional"/>
-  <xs:attribute ref="supportsDuplicateFilterStrings" use="required"/>
-  <xs:attribute ref="release" use="required"/>
-  <xs:attribute ref="singleFilterStringOnly" use="optional"/>
-  <xs:attribute ref="owningParentName" use="required"/>
-  <xs:attribute ref="nonRenamable" use="required"/>
-  <xs:element name="Filter" type="Filter" maxOccurs="unbounded" minOccurs="0"/>
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-<!-- FilterPoolReference definition -->
- <xs:complexType name="FilterPoolReference">
-  <xs:attribute ref="refID" use="required"/>  
- </xs:complexType>
-
-<!-- ServerLauncher definition -->
- <xs:complexType name="ServerLauncher">
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-
-
-<!-- SubSystem type definition -->
- <xs:complexType name="SubSystem">
-  <xs:attribute ref="hidden" use="required"/>
-  <xs:attribute ref="type" use="required"/>
-  <xs:element name="FilterPoolReference" type="FilterPoolReference" maxOccurs="unbounded" minOccurs="0"/> 
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-
-<!-- ConnectorService definition -->
- <xs:complexType name="ConnectorService">
-  <xs:attribute ref="name" use="required"/>
-  <xs:attribute ref="type" use="required"/>
-  <xs:attribute ref="group" use="required"/>
-  <xs:attribute ref="useSSL" use="required"/>
-  <xs:element name="RemoteServerLauncher" type="ServerLauncher" maxOccurs="1" minOccurs="1"/>
-  <xs:element name="SubSystem" type="SubSystem" maxOccurs="unbounded" minOccurs="0"/>
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-<!-- Host definition -->
- <xs:complexType name="Host">
-  <xs:attribute ref="name" use="required"/>
-  <xs:attribute ref="type" use="required"/>
-  <xs:attribute ref="offline" use="required"/>
-  <xs:attribute ref="promptable" use="required"/>
-  <xs:attribute ref="hostName" use="required"/>
-  <xs:attribute ref="description" use="required"/>
-  <xs:attribute ref="defaultUserId" use="required"/>
-  <xs:element name="ConnectorService" type="ConnectorService" maxOccurs="unbounded" minOccurs="0"/> 
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-<!-- Profile definition -->
- <xs:complexType name="Profile">
-  <xs:attribute ref="name" use="required"/>
-  <xs:attribute ref="defaultPrivate" use="required"/>
-  <xs:attribute ref="isActive" use="required"/>
-  <xs:element name="FilterPool" type="FilterPool" maxOccurs="unbounded" minOccurs="0"/>   
-  <xs:element name="Host" type="Host" maxOccurs="unbounded" minOccurs="0"/>   
-  <xs:element name="PropertySet" type="PropertySet" maxOccurs="unbounded" minOccurs="0"/>
- </xs:complexType>
-
-<!-- Define base schema -->
-<xs:element name="Profile" type="Profile" maxOccurs="1" minOccurs="1"/>
-
-</xs:schema> 
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizards.exsd b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizards.exsd
index 8061775cd5b..617409c9726 100644
--- a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizards.exsd
+++ b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizards.exsd
@@ -3,7 +3,7 @@
 <schema targetNamespace="org.eclipse.rse.ui">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.rse.ui" id="newConnectionWizards" name="RSE New Connection Wizards"/>
+         <meta.schema plugin="org.eclipse.rse.ui" id="newConnectionWizards" name="New Connection Wizards"/>
       </appInfo>
       <documentation>
          This extension point is used to register new connection creation wizard extensions. New connection creation wizards appear as choices within the &quot;New Connection&quot; dialog, and are used to create connections from the registered system types. New connection creation wizards can be organized in categories. Uncategorized wizards or wizards with invalid category paths will be sorted in as non-categorized root element.