diff --git a/dev/cosbench-ampli/.gitignore b/dev/cosbench-ampli/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-ampli/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-api/.gitignore b/dev/cosbench-api/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-api/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-cdmi-base/.gitignore b/dev/cosbench-cdmi-base/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-cdmi-base/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-cdmi-swift/.gitignore b/dev/cosbench-cdmi-swift/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-cdmi-swift/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-cdmi-util/.gitignore b/dev/cosbench-cdmi-util/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-cdmi-util/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-controller-web/.gitignore b/dev/cosbench-controller-web/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-controller-web/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-controller/.gitignore b/dev/cosbench-controller/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-controller/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-core-web/.gitignore b/dev/cosbench-core-web/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-core-web/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-core/.gitignore b/dev/cosbench-core/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-core/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-driver-web/.gitignore b/dev/cosbench-driver-web/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-driver-web/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-driver/.gitignore b/dev/cosbench-driver/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-driver/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-gcs/.gitignore b/dev/cosbench-gcs/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-gcs/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-http/.gitignore b/dev/cosbench-http/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-http/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-httpauth/.gitignore b/dev/cosbench-httpauth/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-httpauth/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-keystone/.gitignore b/dev/cosbench-keystone/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-keystone/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-librados/.gitignore b/dev/cosbench-librados/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-librados/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-log/.gitignore b/dev/cosbench-log/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-log/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-mock/.gitignore b/dev/cosbench-mock/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-mock/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-s3/META-INF/MANIFEST.MF b/dev/cosbench-s3/META-INF/MANIFEST.MF
index e81b0826..29174eda 100644
--- a/dev/cosbench-s3/META-INF/MANIFEST.MF
+++ b/dev/cosbench-s3/META-INF/MANIFEST.MF
@@ -6,16 +6,16 @@ Bundle-Version: 0.4.1.0
 Bundle-Vendor: intel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
- aws-java-sdk-s3-1.10.76.jar,
- aws-java-sdk-kms-1.10.76.jar,
- aws-java-sdk-core-1.10.76.jar,
+ aws-java-sdk-s3-1.11.1028.jar,
+ aws-java-sdk-kms-1.11.1028.jar,
+ aws-java-sdk-core-1.11.1028.jar,
  aspectjrt.jar,
  aspectjweaver.jar,
  commons-codec-1.6.jar,
  commons-logging-1.1.3.jar,
  freemarker-2.3.20.jar,
- httpclient-4.3.6.jar,
- httpcore-4.3.3.jar,
+ httpclient-4.5.13.jar,
+ httpcore-4.4.13.jar,
  jackson-core-asl-1.8.7.jar,
  jackson-mapper-asl-1.8.7.jar,
  jackson-databind-2.5.3.jar,
diff --git a/dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar b/dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar
deleted file mode 100644
index 6b24595a..00000000
Binary files a/dev/cosbench-s3/aws-java-sdk-core-1.10.76.jar and /dev/null differ
diff --git a/dev/cosbench-s3/aws-java-sdk-core-1.11.1028.jar b/dev/cosbench-s3/aws-java-sdk-core-1.11.1028.jar
new file mode 100644
index 00000000..5abc4af9
Binary files /dev/null and b/dev/cosbench-s3/aws-java-sdk-core-1.11.1028.jar differ
diff --git a/dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar b/dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar
deleted file mode 100644
index d3551b5a..00000000
Binary files a/dev/cosbench-s3/aws-java-sdk-kms-1.10.76.jar and /dev/null differ
diff --git a/dev/cosbench-s3/aws-java-sdk-kms-1.11.1028.jar b/dev/cosbench-s3/aws-java-sdk-kms-1.11.1028.jar
new file mode 100644
index 00000000..ad981b34
Binary files /dev/null and b/dev/cosbench-s3/aws-java-sdk-kms-1.11.1028.jar differ
diff --git a/dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar b/dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar
deleted file mode 100644
index 2d19a17b..00000000
Binary files a/dev/cosbench-s3/aws-java-sdk-s3-1.10.76.jar and /dev/null differ
diff --git a/dev/cosbench-s3/aws-java-sdk-s3-1.11.1028.jar b/dev/cosbench-s3/aws-java-sdk-s3-1.11.1028.jar
new file mode 100644
index 00000000..51a0a05b
Binary files /dev/null and b/dev/cosbench-s3/aws-java-sdk-s3-1.11.1028.jar differ
diff --git a/dev/cosbench-s3/httpclient-4.3.6.jar b/dev/cosbench-s3/httpclient-4.3.6.jar
deleted file mode 100755
index 091498c9..00000000
Binary files a/dev/cosbench-s3/httpclient-4.3.6.jar and /dev/null differ
diff --git a/dev/cosbench-s3/httpclient-4.5.13.jar b/dev/cosbench-s3/httpclient-4.5.13.jar
new file mode 100644
index 00000000..218ee25f
Binary files /dev/null and b/dev/cosbench-s3/httpclient-4.5.13.jar differ
diff --git a/dev/cosbench-s3/httpcore-4.3.3.jar b/dev/cosbench-s3/httpcore-4.3.3.jar
deleted file mode 100755
index a8747b0c..00000000
Binary files a/dev/cosbench-s3/httpcore-4.3.3.jar and /dev/null differ
diff --git a/dev/cosbench-s3/httpcore-4.4.13.jar b/dev/cosbench-s3/httpcore-4.4.13.jar
new file mode 100644
index 00000000..163dc438
Binary files /dev/null and b/dev/cosbench-s3/httpcore-4.4.13.jar differ
diff --git a/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java b/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
index 509c56be..13396d6c 100644
--- a/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
+++ b/dev/cosbench-s3/src/com/intel/cosbench/api/S3Stor/S3Storage.java
@@ -106,7 +106,7 @@ public InputStream getObject(String container, String object, Config config) {
     public void createContainer(String container, Config config) {
         super.createContainer(container, config);
         try {
-        	if(!client.doesBucketExist(container)) {
+        	if(!client.doesBucketExistV2(container)) {
 	        	
 	            client.createBucket(container);
         	}
@@ -134,7 +134,7 @@ public void createObject(String container, String object, InputStream data,
     public void deleteContainer(String container, Config config) {
         super.deleteContainer(container, config);
         try {
-        	if(client.doesBucketExist(container)) {
+        	if(client.doesBucketExistV2(container)) {
         		client.deleteBucket(container);
         	}
         } catch(AmazonS3Exception awse) {
diff --git a/dev/cosbench-scality/.gitignore b/dev/cosbench-scality/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-scality/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-swauth/.gitignore b/dev/cosbench-swauth/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-swauth/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-swift/.gitignore b/dev/cosbench-swift/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-swift/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dev/cosbench-tomcat/.gitignore b/dev/cosbench-tomcat/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/dev/cosbench-tomcat/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/dist/osgi/plugins/cosbench-s3_0.4.1.0.jar b/dist/osgi/plugins/cosbench-s3_0.4.1.0.jar
new file mode 100644
index 00000000..91a2f76f
Binary files /dev/null and b/dist/osgi/plugins/cosbench-s3_0.4.1.0.jar differ