Feature sdk 571 resumable mpu new branch

build.gradle

@@ -33,7 +33,7 @@ plugins {
     id 'signing'
     id 'maven'
     id 'org.ajoberstar.git-publish' version '3.0.1'
-    id 'nebula.release' version '15.2.0'
+    id 'nebula.release' version '15.3.1'
 }
 
 group 'com.emc.ecs'
@@ -271,4 +271,4 @@ gradle.taskGraph.whenReady { taskGraph ->
         System.setProperty('org.ajoberstar.grgit.auth.username', rootProject.ext.gitUsername)
         System.setProperty('org.ajoberstar.grgit.auth.password', rootProject.ext.gitPassword)
     }
-}
+}

src/main/java/com/emc/object/ObjectConfig.java

@@ -33,6 +33,7 @@
 import com.emc.rest.smart.SmartConfig;
 import com.emc.rest.smart.ecs.Vdc;
 import com.sun.jersey.api.client.config.ClientConfig;
+import org.apache.http.params.CoreConnectionPNames;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -211,6 +212,8 @@ public SmartConfig toSmartConfig() {
 
         // CONNECT_TIMEOUT
         smartConfig.setProperty(ClientConfig.PROPERTY_CONNECT_TIMEOUT, connectTimeout);
+        // apache client uses a different property
+        smartConfig.setProperty(CoreConnectionPNames.CONNECTION_TIMEOUT, connectTimeout);
 
         // READ_TIMEOUT
         smartConfig.setProperty(ClientConfig.PROPERTY_READ_TIMEOUT, readTimeout);
@@ -430,21 +433,27 @@ public int getConnectTimeout() {
         return connectTimeout;
     }
 
-    public void setConnectTimeout(int connectTimeout) {this.connectTimeout = connectTimeout; }
+    public void setConnectTimeout(int connectTimeout) {
+        this.connectTimeout = connectTimeout;
+    }
 
     @ConfigUriProperty
     public int getReadTimeout() {
         return readTimeout;
     }
 
-    public void setReadTimeout(int readTimeout) {this.readTimeout = readTimeout; }
+    public void setReadTimeout(int readTimeout) {
+        this.readTimeout = readTimeout;
+    }
 
     @ConfigUriProperty
     public String getSessionToken() {
         return sessionToken;
     }
 
-    public void setSessionToken(String sessionToken) {this.sessionToken = sessionToken; }
+    public void setSessionToken(String sessionToken) {
+        this.sessionToken = sessionToken;
+    }
 
     @ConfigUriProperty(converter = ConfigUri.StringPropertyConverter.class)
     public Map<String, Object> getProperties() {