Merge "port test_keypairs into nova v3 part2"