Merge pull request #6409 from risaacson/migrate_booleans_bool_ec2_eip

Bulk update of choices=BOOLEANS to type='bool'

cloud/ec2_eip

@@ -258,7 +258,7 @@ def main():
             public_ip = dict(required=False, aliases= ['ip']),
             state = dict(required=False, default='present',
                          choices=['present', 'absent']),
-            in_vpc = dict(required=False, choices=BOOLEANS, default=False),
+            in_vpc = dict(required=False, type='bool', default=False),
             reuse_existing_ip_allowed = dict(required=False, type='bool', default=False),
         )
     )