Fixes #4500 change ec2 module params to type=bool

Revert 4833c2fdf0

cloud/ec2

@@ -568,9 +568,9 @@ def main():
             image = dict(),
             kernel = dict(),
             count = dict(default='1'),
-            monitoring = dict(choices=BOOLEANS, default=False),
+            monitoring = dict(type='bool', default=False),
             ramdisk = dict(),
-            wait = dict(choices=BOOLEANS, default=False),
+            wait = dict(type='bool', default=False),
             wait_timeout = dict(default=300),
             ec2_url = dict(),
             aws_secret_key = dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True),