Merge branch 'master' of github.com:joyent/java-manta into joyent-master

Author: tjcelaya

java-manta-client-unshaded/src/main/java/com/joyent/manta/http/MantaHttpRequestExecutor.java

@@ -108,6 +108,10 @@ protected HttpResponse doReceiveResponse(
             throw mioe;
         }
 
+        if (!response.containsHeader("x-load-balancer")) {
+            response.setHeader("x-load-balancer", extractLoadBalancerAddress(conn));
+        }
+
         return response;
     }