For Mr. Holms
Add reset to default methods
Update keypair name to reflect block device map test suite
San client updates