Merge branch 'fix-keypair-show' into dt-test
Merge branch 'identity-ec2-tests' into dt-test