Updated openstack/openstack
Project: openstack/python-novaclient  6120158e62284acfe81914a8081bdaabcb428162

Convert image tests to httpretty

Change-Id: I3abc51ba4dcc641b72e3ac5e09955e4b22718451
blueprint: httpretty-testing
Updated openstack/openstack
Project: openstack/python-novaclient  2b946ea630072a5901a05bae517e3b31e76f93d8

Convert keypair tests to httpretty

Change-Id: I6876d97dd6600a0a34b89d9f693078f495085622
blueprint: httpretty-testing