fix: ec2/openstack keypair creation

via Chris Howe. We were looking for the right keypair when trying
to pull it down to use it, but the wrong one when creating it.

Change-Id: I965394a7fdb6b48dd4e5f60d7296b41916dd8432
version bump to 6.0.4

Change-Id: I0b5ede31a99f64e5e2d99aea5f625aa4a4f26f80