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 eba9763..bb650f7 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,6 +1,6 @@
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-remoteservices-sdk-3.13.4">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-remoteservices-sdk-3.13.5">
 
-<feature name="ecf-remoteservices-dependencies" version="3.13.4" description="ECF 3.13.4 RemoteServices External Dependencies.  https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+<feature name="ecf-remoteservices-dependencies" version="3.13.5" description="ECF 3.13.5 RemoteServices External Dependencies.  https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
     <bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100</bundle>
     <bundle start-level="50">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.8.0</bundle>
     <bundle>mvn:org.eclipse.platform/org.eclipse.core.jobs/3.8.0</bundle>
@@ -9,74 +9,74 @@
     <feature>eventadmin</feature>
 </feature>
 
-<feature name="ecf-remoteservices-core" version="3.13.4" description="ECF Core">
-    <feature version="3.13.4">ecf-remoteservices-dependencies</feature>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.sharedobject_2.5.100.v20160906-2112.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.discovery_5.0.200.v20160905-1122.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice.asyncproxy_2.0.100.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice_8.11.0.v20160907-0906.jar</bundle>
+<feature name="ecf-remoteservices-core" version="3.13.5" description="ECF Core">
+    <feature version="3.13.5">ecf-remoteservices-dependencies</feature>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.sharedobject_2.5.100.v20160906-2112.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.discovery_5.0.200.v20160905-1122.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice.asyncproxy_2.0.100.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice_8.11.0.v20160907-0906.jar</bundle>
 </feature>
 	
-<feature name="ecf-remoteservices-rsa-impl" version="3.13.4" description="ECF RemoteServices OSGi R6 Remote Service Admin (RSA) Impl.  See https://wiki.eclipse.org/Remote_Services_Admin">
-    <feature version="3.13.4">ecf-remoteservices-core</feature>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.osgi.services.remoteserviceadmin_1.6.100.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin_4.5.0.v20161114-0030.jar</bundle>
+<feature name="ecf-remoteservices-rsa-impl" version="3.13.5" description="ECF RemoteServices OSGi R6 Remote Service Admin (RSA) Impl.  See https://wiki.eclipse.org/Remote_Services_Admin">
+    <feature version="3.13.5">ecf-remoteservices-core</feature>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.osgi.services.remoteserviceadmin_1.6.100.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin_4.5.0.v20161114-0030.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rsa-topology-manager" version="3.13.4" description="ECF RemoteServices OSGi R6 Default Topology Manager (promiscuous).  See https://wiki.eclipse.org/Remote_Services_Admin">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.distribution_2.1.0.v20160907-0906.jar</bundle>
+<feature name="ecf-remoteservices-rsa-topology-manager" version="3.13.5" description="ECF RemoteServices OSGi R6 Default Topology Manager (promiscuous).  See https://wiki.eclipse.org/Remote_Services_Admin">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.distribution_2.1.0.v20160907-0906.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-distprovider-generic" version="3.13.4" description="ECF RemoteServices Generic Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider_4.7.500.v20161010-0033.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.remoteservice_4.2.100.v20161010-0033.jar</bundle>
+<feature name="ecf-remoteservices-distprovider-generic" version="3.13.5" description="ECF RemoteServices Generic Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider_4.7.500.v20161010-0033.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.remoteservice_4.2.100.v20161010-0033.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-distprovider-rosgi" version="3.13.4" description="ECF RemoteService ROSGi Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/ch.ethz.iks.r_osgi.remote_1.0.9.v20161204-0107.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.r_osgi_3.5.600.v20161204-0107.jar</bundle>
+<feature name="ecf-remoteservices-distprovider-rosgi" version="3.13.5" description="ECF RemoteService ROSGi Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/ch.ethz.iks.r_osgi.remote_1.0.9.v20161204-0107.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.r_osgi_3.5.600.v20161204-0107.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-jmdns" version="3.13.4" description="ECF RemoteServices JMDNS Discovery Provider">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.jmdns_4.3.100.v20161228-0059.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-jmdns" version="3.13.5" description="ECF RemoteServices JMDNS Discovery Provider">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.jmdns_4.3.100.v20161228-0059.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-zookeeper" version="3.13.4" description="ECF RemoteServices Zookeeper Discovery Provider.  See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.hadoop.zookeeper_3.3.3.v201105210832.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.zookeeper_1.2.100.v20160905-1122.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-zookeeper" version="3.13.5" description="ECF RemoteServices Zookeeper Discovery Provider.  See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.hadoop.zookeeper_3.3.3.v201105210832.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.zookeeper_1.2.100.v20160905-1122.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-slp" version="3.13.4" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/ch.ethz.iks.slp_1.1.0.v20160913-1604.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.jslp_3.2.100.v20160913-1604.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-slp" version="3.13.5" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/ch.ethz.iks.slp_1.1.0.v20160913-1604.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.jslp_3.2.100.v20160913-1604.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rest" version="3.13.4" description="ECF Discovery REST Provider Support">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.commons.codec_1.6.0.v201305230611.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.httpcomponents.httpclient_4.5.2.v20161115-1643.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.httpcomponents.httpcore_4.4.4.v20161115-1643.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.json_1.0.0.v201011060100.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice.rest_2.7.100.v20160913-1604.jar</bundle>
+<feature name="ecf-remoteservices-rest" version="3.13.5" description="ECF Discovery REST Provider Support">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.commons.codec_1.9.0.v20170208-1614.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.httpcomponents.httpclient_4.5.2.v20161115-1643.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.httpcomponents.httpcore_4.4.4.v20161115-1643.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.json_1.0.0.v201011060100.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice.rest_2.7.100.v20160913-1604.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rsa-noproviders" version="3.13.4" description="ECF 3.13.4 RemoteServices SDK with Generic Distribution Provider">
-	<feature version="3.13.4">ecf-remoteservices-rsa-impl</feature>
-	<feature version="3.13.4">ecf-remoteservices-rsa-topology-manager</feature>
+<feature name="ecf-remoteservices-rsa-noproviders" version="3.13.5" description="ECF 3.13.5 RemoteServices SDK with Generic Distribution Provider">
+	<feature version="3.13.5">ecf-remoteservices-rsa-impl</feature>
+	<feature version="3.13.5">ecf-remoteservices-rsa-topology-manager</feature>
 </feature>
 
-<feature name="ecf-remoteservices-sdk" version="3.13.4" description="ECF 3.13.4 RemoteServices SDK with Generic Distribution Provider and JMDNS/Zeroconf Discovery Provider">
-	<feature version="3.13.4">ecf-remoteservices-rsa-impl</feature>
-	<feature version="3.13.4">ecf-remoteservices-distprovider-generic</feature>
-	<feature version="3.13.4">ecf-remoteservices-discprovider-jmdns</feature>
-	<feature version="3.13.4">ecf-remoteservices-rsa-topology-manager</feature>
+<feature name="ecf-remoteservices-sdk" version="3.13.5" description="ECF 3.13.5 RemoteServices SDK with Generic Distribution Provider and JMDNS/Zeroconf Discovery Provider">
+	<feature version="3.13.5">ecf-remoteservices-rsa-impl</feature>
+	<feature version="3.13.5">ecf-remoteservices-distprovider-generic</feature>
+	<feature version="3.13.5">ecf-remoteservices-discprovider-jmdns</feature>
+	<feature version="3.13.5">ecf-remoteservices-rsa-topology-manager</feature>
 </feature>
 
-<feature name="ecf-remoteservices-examples-timeservice-host" version="3.13.4" description="ECF RemoteService TimeService Host Example.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/com.mycorp.examples.timeservice.host_1.1.100.v20161204-0342.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/com.mycorp.examples.timeservice.async_2.0.0.v20161123-1113.jar</bundle>
+<feature name="ecf-remoteservices-examples-timeservice-host" version="3.13.5" description="ECF RemoteService TimeService Host Example.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/com.mycorp.examples.timeservice.host_1.1.100.v20161204-0342.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/com.mycorp.examples.timeservice.async_2.0.0.v20161123-1113.jar</bundle>
 </feature>
 
 </features>
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features-maven.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features-maven.xml
index 88f2808..a2138ba 100644
--- a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features-maven.xml
+++ b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features-maven.xml
@@ -60,7 +60,7 @@
 </feature>
 
 <feature name="ecf-remoteservices-rest" version="3.13.2" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
-    <bundle>mvn:org.apache.commons/org.apache.commons.codec/1.6.0.v201305230611</bundle>
+    <bundle>mvn:org.apache.commons/org.apache.commons.codec/1.9.0.v20170208-1614</bundle>
     <bundle>mvn:org.apache.httpcomponents/org.apache.httpcomponents.httpclient/4.3.6.v201511171540</bundle>
     <bundle>mvn:org.apache.httpcomponents/org.apache.httpcomponents.httpcore/4.3.3.v201411290715</bundle>
     <bundle>mvn:org.json/org.json/1.0.0.v201011060100</bundle>
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features.xml
index eba9763..3ef0284 100644
--- a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features.xml
+++ b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-features.xml
@@ -1,6 +1,6 @@
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-remoteservices-sdk-3.13.4">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-remoteservices-sdk-3.13.5">
 
-<feature name="ecf-remoteservices-dependencies" version="3.13.4" description="ECF 3.13.4 RemoteServices External Dependencies.  https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+<feature name="ecf-remoteservices-dependencies" version="3.13.5" description="ECF 3.13.5 RemoteServices External Dependencies.  https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
     <bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100</bundle>
     <bundle start-level="50">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.8.0</bundle>
     <bundle>mvn:org.eclipse.platform/org.eclipse.core.jobs/3.8.0</bundle>
@@ -9,74 +9,74 @@
     <feature>eventadmin</feature>
 </feature>
 
-<feature name="ecf-remoteservices-core" version="3.13.4" description="ECF Core">
-    <feature version="3.13.4">ecf-remoteservices-dependencies</feature>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.sharedobject_2.5.100.v20160906-2112.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.discovery_5.0.200.v20160905-1122.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice.asyncproxy_2.0.100.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice_8.11.0.v20160907-0906.jar</bundle>
+<feature name="ecf-remoteservices-core" version="3.13.5" description="ECF Core">
+    <feature version="3.13.5">ecf-remoteservices-dependencies</feature>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.sharedobject_2.5.100.v20160906-2112.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.discovery_5.0.200.v20160905-1122.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice.asyncproxy_2.0.100.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice_8.11.0.v20160907-0906.jar</bundle>
 </feature>
 	
-<feature name="ecf-remoteservices-rsa-impl" version="3.13.4" description="ECF RemoteServices OSGi R6 Remote Service Admin (RSA) Impl.  See https://wiki.eclipse.org/Remote_Services_Admin">
-    <feature version="3.13.4">ecf-remoteservices-core</feature>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.osgi.services.remoteserviceadmin_1.6.100.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin_4.5.0.v20161114-0030.jar</bundle>
+<feature name="ecf-remoteservices-rsa-impl" version="3.13.5" description="ECF RemoteServices OSGi R6 Remote Service Admin (RSA) Impl.  See https://wiki.eclipse.org/Remote_Services_Admin">
+    <feature version="3.13.5">ecf-remoteservices-core</feature>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.osgi.services.remoteserviceadmin_1.6.100.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin_4.5.0.v20161114-0030.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rsa-topology-manager" version="3.13.4" description="ECF RemoteServices OSGi R6 Default Topology Manager (promiscuous).  See https://wiki.eclipse.org/Remote_Services_Admin">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.distribution_2.1.0.v20160907-0906.jar</bundle>
+<feature name="ecf-remoteservices-rsa-topology-manager" version="3.13.5" description="ECF RemoteServices OSGi R6 Default Topology Manager (promiscuous).  See https://wiki.eclipse.org/Remote_Services_Admin">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.distribution_2.1.0.v20160907-0906.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-distprovider-generic" version="3.13.4" description="ECF RemoteServices Generic Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider_4.7.500.v20161010-0033.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.remoteservice_4.2.100.v20161010-0033.jar</bundle>
+<feature name="ecf-remoteservices-distprovider-generic" version="3.13.5" description="ECF RemoteServices Generic Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider_4.7.500.v20161010-0033.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.remoteservice_4.2.100.v20161010-0033.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-distprovider-rosgi" version="3.13.4" description="ECF RemoteService ROSGi Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/ch.ethz.iks.r_osgi.remote_1.0.9.v20161204-0107.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.r_osgi_3.5.600.v20161204-0107.jar</bundle>
+<feature name="ecf-remoteservices-distprovider-rosgi" version="3.13.5" description="ECF RemoteService ROSGi Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/ch.ethz.iks.r_osgi.remote_1.0.9.v20161204-0107.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.r_osgi_3.5.600.v20161204-0107.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-jmdns" version="3.13.4" description="ECF RemoteServices JMDNS Discovery Provider">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.jmdns_4.3.100.v20161228-0059.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-jmdns" version="3.13.5" description="ECF RemoteServices JMDNS Discovery Provider">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.jmdns_4.3.100.v20161228-0059.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-zookeeper" version="3.13.4" description="ECF RemoteServices Zookeeper Discovery Provider.  See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.hadoop.zookeeper_3.3.3.v201105210832.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.zookeeper_1.2.100.v20160905-1122.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-zookeeper" version="3.13.5" description="ECF RemoteServices Zookeeper Discovery Provider.  See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.hadoop.zookeeper_3.3.3.v201105210832.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.zookeeper_1.2.100.v20160905-1122.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-slp" version="3.13.4" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/ch.ethz.iks.slp_1.1.0.v20160913-1604.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.jslp_3.2.100.v20160913-1604.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-slp" version="3.13.5" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/ch.ethz.iks.slp_1.1.0.v20160913-1604.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.jslp_3.2.100.v20160913-1604.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rest" version="3.13.4" description="ECF Discovery REST Provider Support">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.commons.codec_1.6.0.v201305230611.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.httpcomponents.httpclient_4.5.2.v20161115-1643.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.httpcomponents.httpcore_4.4.4.v20161115-1643.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.json_1.0.0.v201011060100.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice.rest_2.7.100.v20160913-1604.jar</bundle>
+<feature name="ecf-remoteservices-rest" version="3.13.5" description="ECF Discovery REST Provider Support">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.commons.codec_1.9.0.v20170208-1614.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.httpcomponents.httpclient_4.5.2.v20170208-1614.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.httpcomponents.httpcore_4.4.4.v20161115-1643.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.json_1.0.0.v201011060100.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice.rest_2.7.100.v20160913-1604.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rsa-noproviders" version="3.13.4" description="ECF 3.13.4 RemoteServices SDK with Generic Distribution Provider">
-	<feature version="3.13.4">ecf-remoteservices-rsa-impl</feature>
-	<feature version="3.13.4">ecf-remoteservices-rsa-topology-manager</feature>
+<feature name="ecf-remoteservices-rsa-noproviders" version="3.13.5" description="ECF 3.13.5 RemoteServices SDK with Generic Distribution Provider">
+	<feature version="3.13.5">ecf-remoteservices-rsa-impl</feature>
+	<feature version="3.13.5">ecf-remoteservices-rsa-topology-manager</feature>
 </feature>
 
-<feature name="ecf-remoteservices-sdk" version="3.13.4" description="ECF 3.13.4 RemoteServices SDK with Generic Distribution Provider and JMDNS/Zeroconf Discovery Provider">
-	<feature version="3.13.4">ecf-remoteservices-rsa-impl</feature>
-	<feature version="3.13.4">ecf-remoteservices-distprovider-generic</feature>
-	<feature version="3.13.4">ecf-remoteservices-discprovider-jmdns</feature>
-	<feature version="3.13.4">ecf-remoteservices-rsa-topology-manager</feature>
+<feature name="ecf-remoteservices-sdk" version="3.13.5" description="ECF 3.13.5 RemoteServices SDK with Generic Distribution Provider and JMDNS/Zeroconf Discovery Provider">
+	<feature version="3.13.5">ecf-remoteservices-rsa-impl</feature>
+	<feature version="3.13.5">ecf-remoteservices-distprovider-generic</feature>
+	<feature version="3.13.5">ecf-remoteservices-discprovider-jmdns</feature>
+	<feature version="3.13.5">ecf-remoteservices-rsa-topology-manager</feature>
 </feature>
 
-<feature name="ecf-remoteservices-examples-timeservice-host" version="3.13.4" description="ECF RemoteService TimeService Host Example.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/com.mycorp.examples.timeservice.host_1.1.100.v20161204-0342.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/com.mycorp.examples.timeservice.async_2.0.0.v20161123-1113.jar</bundle>
+<feature name="ecf-remoteservices-examples-timeservice-host" version="3.13.5" description="ECF RemoteService TimeService Host Example.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/com.mycorp.examples.timeservice.host_1.1.100.v20161204-0342.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/com.mycorp.examples.timeservice.async_2.0.0.v20161123-1113.jar</bundle>
 </feature>
 
 </features>
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features-maven.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features-maven.xml
index bf758da..d5ff433 100644
--- a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features-maven.xml
+++ b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features-maven.xml
@@ -60,7 +60,7 @@
 </feature>
 
 <feature name="ecf-remoteservices-rest" version="3.13.2" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
-    <bundle>mvn:org.apache.commons/org.apache.commons.codec/1.6.0.v201305230611</bundle>
+    <bundle>mvn:org.apache.commons/org.apache.commons.codec/1.9.0.v20170208-1614</bundle>
     <bundle>mvn:org.apache.httpcomponents/org.apache.httpcomponents.httpclient/4.3.6.v201511171540</bundle>
     <bundle>mvn:org.apache.httpcomponents/org.apache.httpcomponents.httpcore/4.3.3.v201411290715</bundle>
     <bundle>mvn:org.json/org.json/1.0.0.v201011060100</bundle>
diff --git a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features.xml b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features.xml
index eba9763..bb650f7 100644
--- a/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features.xml
+++ b/releng/org.eclipse.ecf.releng.bm/karaf/features/karaf4-j8-features.xml
@@ -1,6 +1,6 @@
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-remoteservices-sdk-3.13.4">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="ecf-remoteservices-sdk-3.13.5">
 
-<feature name="ecf-remoteservices-dependencies" version="3.13.4" description="ECF 3.13.4 RemoteServices External Dependencies.  https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
+<feature name="ecf-remoteservices-dependencies" version="3.13.5" description="ECF 3.13.5 RemoteServices External Dependencies.  https://wiki.eclipse.org/ECF#OSGi_Remote_Services">
     <bundle>mvn:org.eclipse.platform/org.eclipse.equinox.supplement/1.6.100</bundle>
     <bundle start-level="50">mvn:org.eclipse.platform/org.eclipse.equinox.common/3.8.0</bundle>
     <bundle>mvn:org.eclipse.platform/org.eclipse.core.jobs/3.8.0</bundle>
@@ -9,74 +9,74 @@
     <feature>eventadmin</feature>
 </feature>
 
-<feature name="ecf-remoteservices-core" version="3.13.4" description="ECF Core">
-    <feature version="3.13.4">ecf-remoteservices-dependencies</feature>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.sharedobject_2.5.100.v20160906-2112.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.discovery_5.0.200.v20160905-1122.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice.asyncproxy_2.0.100.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice_8.11.0.v20160907-0906.jar</bundle>
+<feature name="ecf-remoteservices-core" version="3.13.5" description="ECF Core">
+    <feature version="3.13.5">ecf-remoteservices-dependencies</feature>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.identity_3.8.0.v20161203-2153.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf_3.8.0.v20170104-0657.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.sharedobject_2.5.100.v20160906-2112.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.discovery_5.0.200.v20160905-1122.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice.asyncproxy_2.0.100.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice_8.11.0.v20160907-0906.jar</bundle>
 </feature>
 	
-<feature name="ecf-remoteservices-rsa-impl" version="3.13.4" description="ECF RemoteServices OSGi R6 Remote Service Admin (RSA) Impl.  See https://wiki.eclipse.org/Remote_Services_Admin">
-    <feature version="3.13.4">ecf-remoteservices-core</feature>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.osgi.services.remoteserviceadmin_1.6.100.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.v20160907-0906.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin_4.5.0.v20161114-0030.jar</bundle>
+<feature name="ecf-remoteservices-rsa-impl" version="3.13.5" description="ECF RemoteServices OSGi R6 Remote Service Admin (RSA) Impl.  See https://wiki.eclipse.org/Remote_Services_Admin">
+    <feature version="3.13.5">ecf-remoteservices-core</feature>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.osgi.services.remoteserviceadmin_1.6.100.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy_1.0.0.v20160907-0906.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.remoteserviceadmin_4.5.0.v20161114-0030.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rsa-topology-manager" version="3.13.4" description="ECF RemoteServices OSGi R6 Default Topology Manager (promiscuous).  See https://wiki.eclipse.org/Remote_Services_Admin">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.osgi.services.distribution_2.1.0.v20160907-0906.jar</bundle>
+<feature name="ecf-remoteservices-rsa-topology-manager" version="3.13.5" description="ECF RemoteServices OSGi R6 Default Topology Manager (promiscuous).  See https://wiki.eclipse.org/Remote_Services_Admin">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.osgi.services.distribution_2.1.0.v20160907-0906.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-distprovider-generic" version="3.13.4" description="ECF RemoteServices Generic Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider_4.7.500.v20161010-0033.jar</bundle>
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.remoteservice_4.2.100.v20161010-0033.jar</bundle>
+<feature name="ecf-remoteservices-distprovider-generic" version="3.13.5" description="ECF RemoteServices Generic Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider_4.7.500.v20161010-0033.jar</bundle>
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.remoteservice_4.2.100.v20161010-0033.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-distprovider-rosgi" version="3.13.4" description="ECF RemoteService ROSGi Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/ch.ethz.iks.r_osgi.remote_1.0.9.v20161204-0107.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.r_osgi_3.5.600.v20161204-0107.jar</bundle>
+<feature name="ecf-remoteservices-distprovider-rosgi" version="3.13.5" description="ECF RemoteService ROSGi Distribution Provider.  https://wiki.eclipse.org/EIG:Configuration_Properties">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/ch.ethz.iks.r_osgi.remote_1.0.9.v20161204-0107.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.r_osgi_3.5.600.v20161204-0107.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-jmdns" version="3.13.4" description="ECF RemoteServices JMDNS Discovery Provider">
-	<bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.jmdns_4.3.100.v20161228-0059.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-jmdns" version="3.13.5" description="ECF RemoteServices JMDNS Discovery Provider">
+	<bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.jmdns_4.3.100.v20161228-0059.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-zookeeper" version="3.13.4" description="ECF RemoteServices Zookeeper Discovery Provider.  See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.hadoop.zookeeper_3.3.3.v201105210832.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.zookeeper_1.2.100.v20160905-1122.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-zookeeper" version="3.13.5" description="ECF RemoteServices Zookeeper Discovery Provider.  See https://wiki.eclipse.org/Zookeeper_Based_ECF_Discovery">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.hadoop.zookeeper_3.3.3.v201105210832.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.zookeeper_1.2.100.v20160905-1122.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-discprovider-slp" version="3.13.4" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/ch.ethz.iks.slp_1.1.0.v20160913-1604.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.provider.jslp_3.2.100.v20160913-1604.jar</bundle>
+<feature name="ecf-remoteservices-discprovider-slp" version="3.13.5" description="ECF Discovery SLP Provider.  See https://wiki.eclipse.org/R-OSGi_Properties">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/ch.ethz.iks.slp_1.1.0.v20160913-1604.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.provider.jslp_3.2.100.v20160913-1604.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rest" version="3.13.4" description="ECF Discovery REST Provider Support">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.commons.codec_1.6.0.v201305230611.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.httpcomponents.httpclient_4.5.2.v20161115-1643.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.apache.httpcomponents.httpcore_4.4.4.v20161115-1643.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.json_1.0.0.v201011060100.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/org.eclipse.ecf.remoteservice.rest_2.7.100.v20160913-1604.jar</bundle>
+<feature name="ecf-remoteservices-rest" version="3.13.5" description="ECF Discovery REST Provider Support">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.commons.codec_1.9.0.v20170208-1614.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.httpcomponents.httpclient_4.5.2.v20161115-1643.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.apache.httpcomponents.httpcore_4.4.4.v20161115-1643.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.json_1.0.0.v201011060100.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/org.eclipse.ecf.remoteservice.rest_2.7.100.v20160913-1604.jar</bundle>
 </feature>
 
-<feature name="ecf-remoteservices-rsa-noproviders" version="3.13.4" description="ECF 3.13.4 RemoteServices SDK with Generic Distribution Provider">
-	<feature version="3.13.4">ecf-remoteservices-rsa-impl</feature>
-	<feature version="3.13.4">ecf-remoteservices-rsa-topology-manager</feature>
+<feature name="ecf-remoteservices-rsa-noproviders" version="3.13.5" description="ECF 3.13.5 RemoteServices SDK with Generic Distribution Provider">
+	<feature version="3.13.5">ecf-remoteservices-rsa-impl</feature>
+	<feature version="3.13.5">ecf-remoteservices-rsa-topology-manager</feature>
 </feature>
 
-<feature name="ecf-remoteservices-sdk" version="3.13.4" description="ECF 3.13.4 RemoteServices SDK with Generic Distribution Provider and JMDNS/Zeroconf Discovery Provider">
-	<feature version="3.13.4">ecf-remoteservices-rsa-impl</feature>
-	<feature version="3.13.4">ecf-remoteservices-distprovider-generic</feature>
-	<feature version="3.13.4">ecf-remoteservices-discprovider-jmdns</feature>
-	<feature version="3.13.4">ecf-remoteservices-rsa-topology-manager</feature>
+<feature name="ecf-remoteservices-sdk" version="3.13.5" description="ECF 3.13.5 RemoteServices SDK with Generic Distribution Provider and JMDNS/Zeroconf Discovery Provider">
+	<feature version="3.13.5">ecf-remoteservices-rsa-impl</feature>
+	<feature version="3.13.5">ecf-remoteservices-distprovider-generic</feature>
+	<feature version="3.13.5">ecf-remoteservices-discprovider-jmdns</feature>
+	<feature version="3.13.5">ecf-remoteservices-rsa-topology-manager</feature>
 </feature>
 
-<feature name="ecf-remoteservices-examples-timeservice-host" version="3.13.4" description="ECF RemoteService TimeService Host Example.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/com.mycorp.examples.timeservice.host_1.1.100.v20161204-0342.jar</bundle>
-    <bundle>http://download.eclipse.org/rt/ecf/3.13.4/site.p2/plugins/com.mycorp.examples.timeservice.async_2.0.0.v20161123-1113.jar</bundle>
+<feature name="ecf-remoteservices-examples-timeservice-host" version="3.13.5" description="ECF RemoteService TimeService Host Example.  See https://wiki.eclipse.org/Tutorial:_Building_your_first_OSGi_Remote_Service">
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/com.mycorp.examples.timeservice.host_1.1.100.v20161204-0342.jar</bundle>
+    <bundle>http://download.eclipse.org/rt/ecf/3.13.5/site.p2/plugins/com.mycorp.examples.timeservice.async_2.0.0.v20161123-1113.jar</bundle>
 </feature>
 
 </features>