Modifies servers clients to allow keypairs to be passed in

Change-Id: I714ef261850b744c4c15877b1d9d6841c6dfc9b5
Merge "Modifies servers clients to allow keypairs to be passed in"