diff --git a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
index f248b03..c582d4c 100644
--- a/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
+++ b/org.eclipse.mylyn.commons-target/mylyn-commons-e4.5.target
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="mylyn-commons-e4.5" sequenceNumber="7">
+<?pde version="3.8"?><target name="mylyn-commons-e4.5" sequenceNumber="9">
 <locations>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
 <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
 <unit id="com.thoughtworks.qdox" version="1.6.3.v20081201-1400"/>
@@ -13,8 +11,8 @@
 <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
 <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
 <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 <unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
 <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
 <unit id="org.apache.xml.resolver" version="1.2.0.v201005080400"/>
@@ -28,9 +26,9 @@
 <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
 <unit id="org.mockito" version="1.8.4.v201303031500"/>
 <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/"/>
 </location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/"/>
 </location>
@@ -38,7 +36,7 @@
 <unit id="org.eclipse.jdt.annotation" version="1.0.1.v20130111-135246"/>
 <repository location="http://download.eclipse.org/eclipse/updates/3.8/R-3.8.2-201301310800"/>
 </location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.2.0.v20151130-0157"/>
 <unit id="org.eclipse.ecf.core.source.feature.feature.group" version="1.2.0.v20151130-0157"/>
 <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.0.v20151130-0157"/>
@@ -66,7 +64,7 @@
 <unit id="org.eclipse.sdk.ide" version="4.5.2.M20160212-1500"/>
 <repository location="http://download.eclipse.org/releases/mars"/>
 </location>
-<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.mylyn.context.core" version="0.0.0"/>
 <repository location="http://download.eclipse.org/mylyn/snapshots/3.9"/>
 </location>
diff --git a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
index 17b13c1..ae26c86 100644
--- a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
+++ b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.4.target
@@ -42,8 +42,8 @@
 <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
 <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
 <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
 <unit id="org.apache.tika.core" version="1.3.0.v201304160510"/>
 <unit id="org.apache.tika.parsers" version="1.3.0"/>
@@ -66,7 +66,7 @@
 <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
index bac980b..6f4d4de 100644
--- a/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
+++ b/org.eclipse.mylyn.development/Bootstrap/mylyn-bootstrap-e4.5.target
@@ -40,8 +40,8 @@
 <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
 <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
 <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
 <unit id="org.apache.tika.core" version="1.3.0.v201304160510"/>
 <unit id="org.apache.tika.parsers" version="1.3.0"/>
@@ -64,7 +64,7 @@
 <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target b/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
index e2b33e6..70bb9b1 100644
--- a/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
+++ b/org.eclipse.mylyn.development/Work/mylyn-work-e4.4.target
@@ -34,8 +34,8 @@
 <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
 <unit id="org.apache.commons.lang" version="2.6.0.v201205030909"/>
 <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
-<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170208-1614"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.4.4.v20161115-1643"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
 <unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
 <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
@@ -57,7 +57,7 @@
 <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20170209194730/repository/"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170306214312/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>