Reverted removal of two Aws::EC2::Client waiters.

Fixes #818.

CHANGELOG.md

@@ -1,6 +1,13 @@
 Unreleased Changes
 ------------------
 
+* Issue - Aws::EC2 - Two waiters were added in v2.0.39 and then lost in v2.0.40
+  in this commit: https://github.com/aws/aws-sdk-ruby/commit/f0fad0a038a4f81b0a697f7c367fd2735d9dd698.
+  The waiters did not get merged upstream and got squashed in the automated release.
+  Reverting this loss. Actual changes have also been merged upstream now.
+
+  See [related GitHub issue #818](https://github.com/aws/aws-sdk-ruby/pull/818)
+
 * Feature - Aws::ElasticBeanstalk - Added resource names to
   Aws::ElasticBeanstalk::Client configuration option settings.
 

aws-sdk-core/apis/ec2/2015-04-15/waiters-2.json

@@ -252,6 +252,42 @@
         }
       ]
     },
+    "KeyPairExists": {
+      "operation": "DescribeKeyPairs",
+      "delay": 5,
+      "maxAttempts": 6,
+      "acceptors": [
+        {
+          "expected": true,
+          "matcher": "pathAll",
+          "state": "success",
+          "argument": "length(KeyPairs[].KeyName) > `0`"
+        },
+        {
+          "expected": "InvalidKeyPairNotFound",
+          "matcher": "error",
+          "state": "retry"
+        }
+      ]
+    },
+    "NetworkInterfaceAvailable": {
+      "operation": "DescribeNetworkInterfaces",
+      "delay": 20,
+      "maxAttempts": 10,
+      "acceptors": [
+        {
+          "expected": "available",
+          "matcher": "pathAll",
+          "state": "success",
+          "argument": "NetworkInterfaces[].Status"
+        },
+        {
+          "expected": "InvalidNetworkInterfaceIDNotFound",
+          "matcher": "error",
+          "state": "failure"
+        }
+      ]
+    },
     "PasswordDataAvailable": {
       "operation": "GetPasswordData",
       "maxAttempts": 40,