Merge conflict resolution

Author: tjcelaya

java-manta-client-unshaded/src/main/java/com/joyent/manta/client/MantaClient.java

@@ -225,7 +225,6 @@ public MantaClient(final ConfigContext config,
         this.url = config.getMantaURL();
         this.config = config;
         this.home = ConfigContext.deriveHomeDirectoryFromUser(config.getMantaUser());
-        this.beanSupervisor = new MantaMBeanSupervisor();
 
         final KeyPair keyPair = new KeyPairFactory(config).createKeyPair();
 
@@ -252,6 +251,7 @@ public MantaClient(final ConfigContext config,
 
         this.uriSigner = new UriSigner(this.config, keyPair, signer);
 
+        this.beanSupervisor = new MantaMBeanSupervisor();
         beanSupervisor.expose(this.config);
         beanSupervisor.expose(connectionFactory);
     }