EUCA-8602 AWS and Euca differ in response to run-instances and describe-instances, when no keypair is specified for instance
Merge remote-tracking branch 'origin/testing' into testing