diff --git a/.idea/libraries/http_client.xml b/.idea/libraries/http_client.xml
index a94ed2634598..0645cce0443f 100644
--- a/.idea/libraries/http_client.xml
+++ b/.idea/libraries/http_client.xml
@@ -1,20 +1,20 @@
 <component name="libraryTable">
   <library name="http-client">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/httpcore-4.3.1.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/httpmime-4.3.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/httpclient-4.3.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lib/fluent-hc-4.3.2.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/httpcore-4.3.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/httpmime-4.3.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/httpclient-4.3.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/fluent-hc-4.3.6.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.2-src.zip!/httpcomponents-client-4.3.2/httpmime/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.2-src.zip!/httpcomponents-client-4.3.2/httpmime/src/main/java-deprecated" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.2-src.zip!/httpcomponents-client-4.3.2/fluent-hc/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.2-src.zip!/httpcomponents-client-4.3.2/httpclient/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.2-src.zip!/httpcomponents-client-4.3.2/httpclient/src/main/java-deprecated" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.3.1-src.zip!/httpcomponents-core-4.3.1/httpcore/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.3.1-src.zip!/httpcomponents-core-4.3.1/httpcore/src/main/java-deprecated" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.6-src.zip!/httpcomponents-client-4.3.6/httpmime/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.6-src.zip!/httpcomponents-client-4.3.6/httpmime/src/main/java-deprecated" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.6-src.zip!/httpcomponents-client-4.3.6/fluent-hc/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.6-src.zip!/httpcomponents-client-4.3.6/httpclient/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-client-4.3.6-src.zip!/httpcomponents-client-4.3.6/httpclient/src/main/java-deprecated" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.3.3-src.zip!/httpcomponents-core-4.3.3/httpcore/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/lib/src/httpcomponents-core-4.3.3-src.zip!/httpcomponents-core-4.3.3/httpcore/src/main/java-deprecated" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/lib/fluent-hc-4.3.2.jar b/lib/fluent-hc-4.3.2.jar
deleted file mode 100644
index 0b6288adab09..000000000000
Binary files a/lib/fluent-hc-4.3.2.jar and /dev/null differ
diff --git a/lib/fluent-hc-4.3.6.jar b/lib/fluent-hc-4.3.6.jar
new file mode 100644
index 000000000000..f111d9974e72
Binary files /dev/null and b/lib/fluent-hc-4.3.6.jar differ
diff --git a/lib/httpclient-4.3.2.jar b/lib/httpclient-4.3.6.jar
similarity index 66%
rename from lib/httpclient-4.3.2.jar
rename to lib/httpclient-4.3.6.jar
index 904409dac805..00e98110dfb6 100644
Binary files a/lib/httpclient-4.3.2.jar and b/lib/httpclient-4.3.6.jar differ
diff --git a/lib/httpcore-4.3.1.jar b/lib/httpcore-4.3.3.jar
similarity index 67%
rename from lib/httpcore-4.3.1.jar
rename to lib/httpcore-4.3.3.jar
index 422cd6f5d2d0..a8747b0cf91c 100644
Binary files a/lib/httpcore-4.3.1.jar and b/lib/httpcore-4.3.3.jar differ
diff --git a/lib/httpmime-4.3.2.jar b/lib/httpmime-4.3.6.jar
similarity index 67%
rename from lib/httpmime-4.3.2.jar
rename to lib/httpmime-4.3.6.jar
index f562d5645873..aa01f76d41ad 100644
Binary files a/lib/httpmime-4.3.2.jar and b/lib/httpmime-4.3.6.jar differ
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 60d8770051a9..9cbd677cabbb 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -9,11 +9,11 @@ commons-codec-1.8.jar
 commons-httpclient-3.1-patched.jar
 commons-logging-1.1.3.jar
 commons-net-3.1.jar
-httpcore-4.3.1.jar
-httpclient-4.3.2.jar
-fluent-hc-4.3.2.jar
+httpcore-4.3.3.jar
+httpclient-4.3.6.jar
+fluent-hc-4.3.6.jar
 freemarker.jar
-httpmime-4.3.2.jar
+httpmime-4.3.6.jar
 ecj-4.4.jar
 groovy-all-2.2.1.jar
 gson-2.3.jar
diff --git a/lib/src/httpcomponents-client-4.3.2-src.zip b/lib/src/httpcomponents-client-4.3.6-src.zip
similarity index 66%
rename from lib/src/httpcomponents-client-4.3.2-src.zip
rename to lib/src/httpcomponents-client-4.3.6-src.zip
index a9d4b7aea5e1..21e675578e88 100644
Binary files a/lib/src/httpcomponents-client-4.3.2-src.zip and b/lib/src/httpcomponents-client-4.3.6-src.zip differ
diff --git a/lib/src/httpcomponents-core-4.3.1-src.zip b/lib/src/httpcomponents-core-4.3.3-src.zip
similarity index 82%
rename from lib/src/httpcomponents-core-4.3.1-src.zip
rename to lib/src/httpcomponents-core-4.3.3-src.zip
index ab0320933abb..3d57dec09321 100644
Binary files a/lib/src/httpcomponents-core-4.3.1-src.zip and b/lib/src/httpcomponents-core-4.3.3-src.zip differ