Make sure master_uri is set correctly when using client api

@thatch Adi found an issue with the transport changes when using the client API.  Can you check really quick to make sure this is the best place to set the master_uri?  Thanks.