Merging master to update branch

Author: rpmoore

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/PutObjectRequest.java

@@ -161,20 +161,20 @@ public ChecksumType.Type getChecksumType() {
     }
 
 
-	public PutObjectRequest withMetaData(final String key, final String value) {
+    public PutObjectRequest withMetaData(final String key, final String value) {
         if (isStringNullOrEmpty(value)) {
             LOG.warn("Key has not been added to metadata because value was null or empty: " + key);
             return this;
         }
-		final String modifiedKey;
-		if (!key.toLowerCase().startsWith(AMZ_META_HEADER)){
-			modifiedKey = AMZ_META_HEADER + key;
-		} else {
-			modifiedKey = key;
-		}
-		this.getHeaders().put(modifiedKey, value);
-		return this;
-	}
+        final String modifiedKey;
+        if (!key.toLowerCase().startsWith(AMZ_META_HEADER)){
+            modifiedKey = AMZ_META_HEADER + key;
+        } else {
+            modifiedKey = key;
+        }
+        this.getHeaders().put(modifiedKey, value);
+        return this;
+    }
 
     @Override
     public HttpVerb getVerb() {