diff --git a/lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py b/lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py
index 1a70ec940f0..8861636f38d 100644
--- a/lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py
+++ b/lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py
@@ -70,7 +70,7 @@ options:
         description: Whether or not to override values of minimum and/or maximum tasks if it's already set.
         required: no
         default: no
-        choices: [ 'yes', 'no' ]
+        type: bool
         version_added: "2.6"
 extends_documentation_fragment:
     - aws
diff --git a/lib/ansible/modules/cloud/amazon/aws_direct_connect_connection.py b/lib/ansible/modules/cloud/amazon/aws_direct_connect_connection.py
index 004434b9edd..c2692a55d22 100644
--- a/lib/ansible/modules/cloud/amazon/aws_direct_connect_connection.py
+++ b/lib/ansible/modules/cloud/amazon/aws_direct_connect_connection.py
@@ -57,6 +57,7 @@ options:
     description:
       - To modify bandwidth or location the connection will need to be deleted and recreated.
         By default this will not happen - this option must be set to True.
+    type: bool
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/cloud/amazon/cloudfront_distribution.py b/lib/ansible/modules/cloud/amazon/cloudfront_distribution.py
index 738d4e16c7c..aaa49a841d9 100644
--- a/lib/ansible/modules/cloud/amazon/cloudfront_distribution.py
+++ b/lib/ansible/modules/cloud/amazon/cloudfront_distribution.py
@@ -67,7 +67,7 @@ options:
           specified. If no tags are specified, it removes all existing tags for the distribution. When I(purge_tags=no), existing tags are kept and I(tags)
           are added, if specified.
       default: 'no'
-      choices: ['yes', 'no']
+      type: bool
 
     alias:
       description:
@@ -85,7 +85,7 @@ options:
         - Specifies whether existing aliases will be removed before adding new aliases. When I(purge_aliases=yes), existing aliases are removed and I(aliases)
           are added.
       default: 'no'
-      choices: ['yes', 'no']
+      type: bool
 
     default_root_object:
       description:
@@ -245,7 +245,7 @@ options:
       description:
         - A boolean value that specifies whether the distribution is enabled or disabled.
       default: 'yes'
-      choices: ['yes', 'no']
+      type: bool
 
     viewer_certificate:
       description:
@@ -280,13 +280,13 @@ options:
     ipv6_enabled:
       description:
         - Determines whether IPv6 support is enabled or not.
-      choices: ['yes', 'no']
+      type: bool
       default: 'no'
 
     wait:
       description:
         - Specifies whether the module waits until the distribution has completed processing the creation or update.
-      choices: ['yes', 'no']
+      type: bool
       default: 'no'
 
     wait_timeout:
diff --git a/lib/ansible/modules/cloud/amazon/ec2_ami.py b/lib/ansible/modules/cloud/amazon/ec2_ami.py
index 0b24bae31f6..1b03ccd1083 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_ami.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_ami.py
@@ -44,7 +44,7 @@ options:
     description:
       - Wait for the AMI to be in state 'available' before returning.
     default: "no"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - How long before wait gives up, in seconds.
@@ -62,7 +62,7 @@ options:
       - Flag indicating that the bundling process should not attempt to shutdown the instance before bundling. If this flag is True, the
         responsibility of maintaining file system integrity is left to the owner of the instance.
     default: no
-    choices: [ "yes", "no" ]
+    type: bool
   image_id:
     description:
       - Image ID to be deregistered.
@@ -77,7 +77,7 @@ options:
     description:
       - Delete snapshots when deregistering the AMI.
     default: "no"
-    choices: [ "yes", "no" ]
+    type: bool
   tags:
     description:
       - A dictionary of tags to add to the new image; '{"key":"value"}' and '{"key":"value","key":"value"}'
diff --git a/lib/ansible/modules/cloud/amazon/ec2_ami_facts.py b/lib/ansible/modules/cloud/amazon/ec2_ami_facts.py
index 0561556520d..296a893aa16 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_ami_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_ami_facts.py
@@ -39,7 +39,7 @@ options:
     description:
       - Describe attributes (like launchPermission) of the images found.
     default: no
-    choices: ["yes", "no"]
+    type: bool
 
 extends_documentation_fragment:
     - aws
diff --git a/lib/ansible/modules/cloud/amazon/ec2_eni.py b/lib/ansible/modules/cloud/amazon/ec2_eni.py
index babbcb445e9..fe42cf3c0bf 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_eni.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_eni.py
@@ -64,6 +64,7 @@ options:
         won't change
     default: 'yes'
     version_added: 2.2
+    type: bool
   force_detach:
     description:
       - Force detachment of the interface. This applies either when explicitly detaching the interface by setting instance_id
diff --git a/lib/ansible/modules/cloud/amazon/ec2_group.py b/lib/ansible/modules/cloud/amazon/ec2_group.py
index f11b4f79324..fecfd145178 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_group.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_group.py
@@ -100,7 +100,7 @@ options:
         tags will not be modified.
     required: false
     default: yes
-    choices: [ 'yes', 'no' ]
+    type: bool
 
 extends_documentation_fragment:
     - aws
diff --git a/lib/ansible/modules/cloud/amazon/ec2_snapshot.py b/lib/ansible/modules/cloud/amazon/ec2_snapshot.py
index fed3ebe87ed..cfe54af07d1 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_snapshot.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_snapshot.py
@@ -43,7 +43,7 @@ options:
   wait:
     description:
       - wait for the snapshot to be ready
-    choices: ['yes', 'no']
+    type: bool
     required: false
     default: yes
     version_added: "1.5.1"
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py
index 28d76249cd3..cd0f01746b9 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py
@@ -62,7 +62,7 @@ options:
         behaviour from AWS.
     required: false
     default: no
-    choices: ["yes", "no"]
+    type: bool
   wait_timeout:
     description:
       - Used in conjunction with wait. Number of seconds to wait for status.
diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_net.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_net.py
index 33db02c61ea..8c74e7201e5 100644
--- a/lib/ansible/modules/cloud/amazon/ec2_vpc_net.py
+++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_net.py
@@ -35,7 +35,7 @@ options:
     description:
       - Remove CIDRs that are associated with the VPC and are not specified in C(cidr_block).
     default: no
-    choices: [ 'yes', 'no' ]
+    type: bool
     version_added: '2.5'
   tenancy:
     description:
@@ -46,12 +46,12 @@ options:
     description:
       - Whether to enable AWS DNS support.
     default: yes
-    choices: [ 'yes', 'no' ]
+    type: bool
   dns_hostnames:
     description:
       - Whether to enable AWS hostname support.
     default: yes
-    choices: [ 'yes', 'no' ]
+    type: bool
   dhcp_opts_id:
     description:
       - the id of the DHCP options to use for this vpc
diff --git a/lib/ansible/modules/cloud/amazon/ecs_service_facts.py b/lib/ansible/modules/cloud/amazon/ecs_service_facts.py
index e28f0c2c167..7bc3d402b7f 100644
--- a/lib/ansible/modules/cloud/amazon/ecs_service_facts.py
+++ b/lib/ansible/modules/cloud/amazon/ecs_service_facts.py
@@ -27,13 +27,13 @@ options:
             - Set this to true if you want detailed information about the services.
         required: false
         default: 'false'
-        choices: ['true', 'false']
+        type: bool
     events:
         description:
             - Whether to return ECS service events. Only has an effect if C(details) is true.
         required: false
         default: 'true'
-        choices: ['true', 'false']
+        type: bool
         version_added: "2.6"
     cluster:
         description:
diff --git a/lib/ansible/modules/cloud/amazon/elb_application_lb.py b/lib/ansible/modules/cloud/amazon/elb_application_lb.py
index 2878dceb24b..3485af2a8c9 100644
--- a/lib/ansible/modules/cloud/amazon/elb_application_lb.py
+++ b/lib/ansible/modules/cloud/amazon/elb_application_lb.py
@@ -32,7 +32,7 @@ options:
     description:
       - "Whether or not to enable access logs. When true, I(access_logs_s3_bucket) must be set."
     required: false
-    choices: [ 'yes', 'no' ]
+    type: bool
   access_logs_s3_bucket:
     description:
       - The name of the S3 bucket for the access logs. This attribute is required if access logs in Amazon S3 are enabled. The bucket must exist in the same
@@ -47,7 +47,7 @@ options:
       - Indicates whether deletion protection for the ELB is enabled.
     required: false
     default: no
-    choices: [ 'yes', 'no' ]
+    type: bool
   idle_timeout:
     description:
       - The number of seconds to wait before an idle connection is closed.
@@ -68,14 +68,14 @@ options:
       - If yes, existing listeners will be purged from the ELB to match exactly what is defined by I(listeners) parameter. If the I(listeners) parameter is
         not set then listeners will not be modified
     default: yes
-    choices: [ 'yes', 'no' ]
+    type: bool
   purge_tags:
     description:
       - If yes, existing tags will be purged from the resource to match exactly what is defined by I(tags) parameter. If the I(tags) parameter is not set then
         tags will not be modified.
     required: false
     default: yes
-    choices: [ 'yes', 'no' ]
+    type: bool
   subnets:
     description:
       - A list of the IDs of the subnets to attach to the load balancer. You can specify only one subnet per Availability Zone. You must specify subnets from
diff --git a/lib/ansible/modules/cloud/amazon/elb_target.py b/lib/ansible/modules/cloud/amazon/elb_target.py
index 5b2143d0994..260be30fcac 100644
--- a/lib/ansible/modules/cloud/amazon/elb_target.py
+++ b/lib/ansible/modules/cloud/amazon/elb_target.py
@@ -19,7 +19,7 @@ options:
     description:
       - The default behaviour for targets that are unused is to leave them registered. If instead you would like to remove them
         set I(deregister_unused) to yes.
-    choices: [ 'yes', 'no' ]
+    type: bool
   target_az:
     description:
       - An Availability Zone or all. This determines whether the target receives traffic from the load balancer nodes in the specified
diff --git a/lib/ansible/modules/cloud/amazon/elb_target_group.py b/lib/ansible/modules/cloud/amazon/elb_target_group.py
index 26a0407f0f3..4e33c253963 100644
--- a/lib/ansible/modules/cloud/amazon/elb_target_group.py
+++ b/lib/ansible/modules/cloud/amazon/elb_target_group.py
@@ -78,7 +78,7 @@ options:
         tags will not be modified.
     required: false
     default: yes
-    choices: [ 'yes', 'no' ]
+    type: bool
   state:
     description:
       - Create or destroy the target group.
@@ -87,7 +87,7 @@ options:
   stickiness_enabled:
     description:
       - Indicates whether sticky sessions are enabled.
-    choices: [ 'yes', 'no' ]
+    type: bool
   stickiness_lb_cookie_duration:
     description:
       - The time period, in seconds, during which requests from a client should be routed to the same target. After this time period expires, the load
diff --git a/lib/ansible/modules/cloud/centurylink/clc_aa_policy.py b/lib/ansible/modules/cloud/centurylink/clc_aa_policy.py
index 50ccd968952..63232872e8b 100644
--- a/lib/ansible/modules/cloud/centurylink/clc_aa_policy.py
+++ b/lib/ansible/modules/cloud/centurylink/clc_aa_policy.py
@@ -38,7 +38,7 @@ options:
       - Whether to wait for the tasks to finish before returning.
     default: True
     required: False
-    choices: [True, False]
+    type: bool
 requirements:
     - python = 2.7
     - requests >= 2.5.0
diff --git a/lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py b/lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py
index 551caec361c..3f009e3e8e1 100644
--- a/lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py
+++ b/lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py
@@ -41,7 +41,7 @@ options:
   wait:
     description:
       - Whether to wait for the tasks to finish before returning.
-    choices: [ True, False ]
+    type: bool
     default: True
     required: False
 requirements:
diff --git a/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py b/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py
index 7e9245d0c33..44b6087c926 100644
--- a/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py
+++ b/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py
@@ -59,7 +59,7 @@ options:
   enabled:
     description:
       - Whether the firewall policy is enabled or disabled
-    type: bool
+    choices: [True, False]
     default: 'yes'
 requirements:
     - python = 2.7
diff --git a/lib/ansible/modules/cloud/centurylink/clc_group.py b/lib/ansible/modules/cloud/centurylink/clc_group.py
index 83268a3562d..50b8aff3da4 100644
--- a/lib/ansible/modules/cloud/centurylink/clc_group.py
+++ b/lib/ansible/modules/cloud/centurylink/clc_group.py
@@ -45,7 +45,7 @@ options:
   wait:
     description:
       - Whether to wait for the tasks to finish before returning.
-    choices: [ True, False ]
+    type: bool
     default: True
     required: False
 requirements:
diff --git a/lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py b/lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py
index 3d9a70b1b24..dc2a544e4ec 100644
--- a/lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py
+++ b/lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py
@@ -39,7 +39,7 @@ options:
       - Whether to wait for the provisioning tasks to finish before returning.
     default: True
     required: False
-    choices: [True, False]
+    type: bool
 requirements:
     - python = 2.7
     - requests >= 2.5.0
diff --git a/lib/ansible/modules/cloud/cloudstack/cs_network_offering.py b/lib/ansible/modules/cloud/cloudstack/cs_network_offering.py
index 4f2c1b5c7bc..c8b76d7e050 100644
--- a/lib/ansible/modules/cloud/cloudstack/cs_network_offering.py
+++ b/lib/ansible/modules/cloud/cloudstack/cs_network_offering.py
@@ -50,7 +50,7 @@ options:
   conserve_mode:
     description:
       - Whether the network offering has IP conserve mode enabled.
-    choices: [ yes, no ]
+    type: bool
   details:
     description:
       - Network offering details in key/value pairs.
@@ -69,7 +69,7 @@ options:
       - If true keepalive will be turned on in the loadbalancer.
       - At the time of writing this has only an effect on haproxy.
       - the mode http and httpclose options are unset in the haproxy conf file.
-    choices: [ yes, no ]
+    type: bool
   max_connections:
     description:
       - Maximum number of concurrent connections supported by the network offering.
@@ -92,11 +92,11 @@ options:
     description:
       - Wheter the network offering supports specifying IP ranges.
       - Defaulted to C(no) by the API if not specified.
-    choices: [ yes, no ]
+    type: bool
   specify_vlan:
     description:
       - Whether the network offering supports vlans or not.
-    choices: [ yes, no ]
+    type: bool
 extends_documentation_fragment: cloudstack
 '''
 
diff --git a/lib/ansible/modules/cloud/cloudstack/cs_service_offering.py b/lib/ansible/modules/cloud/cloudstack/cs_service_offering.py
index add6f07147b..8231de356f3 100644
--- a/lib/ansible/modules/cloud/cloudstack/cs_service_offering.py
+++ b/lib/ansible/modules/cloud/cloudstack/cs_service_offering.py
@@ -36,7 +36,7 @@ options:
   limit_cpu_usage:
     description:
       - Restrict the CPU usage to committed service offering.
-    choices: [ yes, no ]
+    type: bool
   deployment_planner:
     description:
       - The deployment planner heuristics used to deploy a VM of this offering.
@@ -77,13 +77,13 @@ options:
   is_system:
     description:
       - Whether it is a system VM offering or not.
-    choices: [ yes, no ]
+    type: bool
     default: no
   is_volatile:
     description:
       - Whether the virtual machine needs to be volatile or not.
       - Every reboot of VM the root disk is detached then destroyed and a fresh root disk is created and attached to VM.
-    choices: [ yes, no ]
+    type: bool
     default: no
   memory:
     description:
@@ -99,7 +99,7 @@ options:
   offer_ha:
     description:
       - Whether HA is set for the service offering.
-    choices: [ yes, no ]
+    type: bool
     default: no
   provisioning_type:
     description:
diff --git a/lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py b/lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py
index 153992e3fae..b4e91600d06 100644
--- a/lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py
+++ b/lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py
@@ -59,12 +59,12 @@ options:
     description:
       - Enable Dead Peer Detection.
       - Disabled per default by the API on creation if not set.
-    choices: [ yes, no ]
+    type: bool
   force_encap:
     description:
       - Force encapsulation for NAT traversal.
       - Disabled per default by the API on creation if not set.
-    choices: [ yes, no ]
+    type: bool
   state:
     description:
       - State of the VPN customer gateway.
diff --git a/lib/ansible/modules/cloud/misc/virt_net.py b/lib/ansible/modules/cloud/misc/virt_net.py
index 93c0081941e..a09528223be 100644
--- a/lib/ansible/modules/cloud/misc/virt_net.py
+++ b/lib/ansible/modules/cloud/misc/virt_net.py
@@ -49,7 +49,7 @@ options:
               Modify was added in version 2.1
     autostart:
         required: false
-        choices: ["yes", "no"]
+        type: bool
         description:
             - Specify if a given network should be started automatically on system boot.
     uri:
diff --git a/lib/ansible/modules/cloud/misc/virt_pool.py b/lib/ansible/modules/cloud/misc/virt_pool.py
index a3994a4ab20..76762a7a4ff 100644
--- a/lib/ansible/modules/cloud/misc/virt_pool.py
+++ b/lib/ansible/modules/cloud/misc/virt_pool.py
@@ -49,7 +49,7 @@ options:
               See examples.
     autostart:
         required: false
-        choices: ["yes", "no"]
+        type: bool
         description:
             - Specify if a given storage pool should be started automatically on system boot.
     uri:
diff --git a/lib/ansible/modules/cloud/oneandone/oneandone_firewall_policy.py b/lib/ansible/modules/cloud/oneandone/oneandone_firewall_policy.py
index 6a6a23fc8aa..e3f17383a3e 100644
--- a/lib/ansible/modules/cloud/oneandone/oneandone_firewall_policy.py
+++ b/lib/ansible/modules/cloud/oneandone/oneandone_firewall_policy.py
@@ -87,7 +87,7 @@ options:
       - wait for the instance to be in state 'running' before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py b/lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py
index c5f39c7f75f..aebad41501e 100644
--- a/lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py
+++ b/lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py
@@ -122,7 +122,7 @@ options:
       - wait for the instance to be in state 'running' before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/oneandone/oneandone_monitoring_policy.py b/lib/ansible/modules/cloud/oneandone/oneandone_monitoring_policy.py
index df303b0ebc8..735cc848afc 100644
--- a/lib/ansible/modules/cloud/oneandone/oneandone_monitoring_policy.py
+++ b/lib/ansible/modules/cloud/oneandone/oneandone_monitoring_policy.py
@@ -168,7 +168,7 @@ options:
       - wait for the instance to be in state 'running' before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/oneandone/oneandone_private_network.py b/lib/ansible/modules/cloud/oneandone/oneandone_private_network.py
index 72eea452673..06ed26e2624 100644
--- a/lib/ansible/modules/cloud/oneandone/oneandone_private_network.py
+++ b/lib/ansible/modules/cloud/oneandone/oneandone_private_network.py
@@ -76,7 +76,7 @@ options:
       - wait for the instance to be in state 'running' before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py b/lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py
index a13013fde11..86376124f96 100644
--- a/lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py
+++ b/lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py
@@ -68,7 +68,7 @@ options:
       - wait for the instance to be in state 'running' before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py
index e3205443799..070c4b2a813 100644
--- a/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py
+++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py
@@ -47,7 +47,7 @@ options:
       - wait for the datacenter to be created before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py
index 5d01618b3ee..c30d8c9537a 100644
--- a/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py
+++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py
@@ -48,7 +48,7 @@ options:
       - wait for the operation to complete before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py
index c65939e7fa0..52776d5001f 100644
--- a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py
+++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py
@@ -73,7 +73,7 @@ options:
     description:
       - Whether or not to increment a single number in the name for created virtual machines.
     default: yes
-    choices: ["yes", "no"]
+    type: bool
   instance_ids:
     description:
       - list of instance ids, currently only used when state='absent' to remove instances.
@@ -91,7 +91,7 @@ options:
       - wait for the datacenter to be created before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py
index 581e76a1ff2..1e6adc33066 100644
--- a/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py
+++ b/lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py
@@ -44,7 +44,7 @@ options:
       - wait for the operation to complete before returning
     required: false
     default: "yes"
-    choices: [ "yes", "no" ]
+    type: bool
   wait_timeout:
     description:
       - how long before wait gives up, in seconds
diff --git a/lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py b/lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py
index 68426656f78..5f92dbf9330 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py
@@ -62,9 +62,7 @@ options:
   wait:
     required: false
     default: "no"
-    choices:
-      - "yes"
-      - "no"
+    type: bool
     description:
       - Wait for the load balancer to become active before returning
   wait_timeout:
diff --git a/lib/ansible/modules/cloud/rackspace/rax_files.py b/lib/ansible/modules/cloud/rackspace/rax_files.py
index 68742d3f897..7b31b80ac90 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_files.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_files.py
@@ -24,9 +24,7 @@ options:
     description:
       - Optionally clear existing metadata when applying metadata to existing containers.
         Selecting this option is only appropriate when setting type=meta
-    choices:
-      - "yes"
-      - "no"
+    type: bool
     default: "no"
   container:
     description:
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py b/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py
index 04e5db258fd..423419b09d3 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py
@@ -60,7 +60,7 @@ options:
     description:
     - If yes, create this alarm, but leave it in an inactive state. Defaults to
       no.
-    choices: [ "yes", "no" ]
+    type: bool
   metadata:
     description:
     - Arbitrary key/value pairs to accompany the alarm. Must be a hash of String
diff --git a/lib/ansible/modules/cloud/rackspace/rax_mon_check.py b/lib/ansible/modules/cloud/rackspace/rax_mon_check.py
index a6e791db96a..89ee2896bae 100644
--- a/lib/ansible/modules/cloud/rackspace/rax_mon_check.py
+++ b/lib/ansible/modules/cloud/rackspace/rax_mon_check.py
@@ -88,7 +88,7 @@ options:
   disabled:
     description:
     - If "yes", ensure the check is created, but don't actually use it yet.
-    choices: [ "yes", "no" ]
+    type: bool
   metadata:
     description:
     - Hash of arbitrary key-value pairs to accompany this check if it fires.
diff --git a/lib/ansible/modules/cloud/smartos/imgadm.py b/lib/ansible/modules/cloud/smartos/imgadm.py
index 7d7b04f964c..30f629b7e06 100644
--- a/lib/ansible/modules/cloud/smartos/imgadm.py
+++ b/lib/ansible/modules/cloud/smartos/imgadm.py
@@ -24,7 +24,7 @@ author: Jasper Lievisse Adriaanse (@jasperla)
 options:
     force:
         required: false
-        choices: [ yes, no ]
+        type: bool
         description:
           - Force a given operation (where supported by imgadm(1M)).
     pool:
diff --git a/lib/ansible/modules/cloud/vultr/vr_user.py b/lib/ansible/modules/cloud/vultr/vr_user.py
index 6f10a17b7ae..11ded66e1c8 100644
--- a/lib/ansible/modules/cloud/vultr/vr_user.py
+++ b/lib/ansible/modules/cloud/vultr/vr_user.py
@@ -36,12 +36,12 @@ options:
     description:
       - Password will only be changed with enforcement.
     default: no
-    choices: [ yes, no ]
+    type: bool
   api_enabled:
     description:
       - Whether the API is enabled or not.
     default: yes
-    choices: [ yes, no ]
+    type: bool
   acls:
     description:
       - List of ACLs this users should have, see U(https://www.vultr.com/api/#user_user_list).
diff --git a/lib/ansible/modules/crypto/openssl_csr.py b/lib/ansible/modules/crypto/openssl_csr.py
index c6dfa75fd54..07e7bddf6f2 100644
--- a/lib/ansible/modules/crypto/openssl_csr.py
+++ b/lib/ansible/modules/crypto/openssl_csr.py
@@ -54,7 +54,7 @@ options:
     force:
         required: false
         default: False
-        choices: [ True, False ]
+        type: bool
         description:
             - Should the certificate signing request be forced regenerated by this ansible module
     path:
diff --git a/lib/ansible/modules/crypto/openssl_dhparam.py b/lib/ansible/modules/crypto/openssl_dhparam.py
index abc67767e18..849477c1f89 100644
--- a/lib/ansible/modules/crypto/openssl_dhparam.py
+++ b/lib/ansible/modules/crypto/openssl_dhparam.py
@@ -40,7 +40,7 @@ options:
     force:
         required: false
         default: False
-        choices: [ True, False ]
+        type: bool
         description:
             - Should the parameters be regenerated even it it already exists
     path:
diff --git a/lib/ansible/modules/crypto/openssl_privatekey.py b/lib/ansible/modules/crypto/openssl_privatekey.py
index cca7228531e..9834146fc04 100644
--- a/lib/ansible/modules/crypto/openssl_privatekey.py
+++ b/lib/ansible/modules/crypto/openssl_privatekey.py
@@ -46,7 +46,7 @@ options:
     force:
         required: false
         default: False
-        choices: [ True, False ]
+        type: bool
         description:
             - Should the key be regenerated even it it already exists
     path:
diff --git a/lib/ansible/modules/crypto/openssl_publickey.py b/lib/ansible/modules/crypto/openssl_publickey.py
index ec8d945f659..6ff923ffc96 100644
--- a/lib/ansible/modules/crypto/openssl_publickey.py
+++ b/lib/ansible/modules/crypto/openssl_publickey.py
@@ -35,7 +35,7 @@ options:
     force:
         required: false
         default: False
-        choices: [ True, False ]
+        type: bool
         description:
             - Should the key be regenerated even it it already exists
     format:
diff --git a/lib/ansible/modules/database/influxdb/influxdb_user.py b/lib/ansible/modules/database/influxdb/influxdb_user.py
index 6b78276dbad..52a2057006a 100644
--- a/lib/ansible/modules/database/influxdb/influxdb_user.py
+++ b/lib/ansible/modules/database/influxdb/influxdb_user.py
@@ -36,7 +36,7 @@ options:
     description:
       - Whether the user should be in the admin role or not.
     default: no
-    choices: [ yes, no]
+    type: bool
   state:
     description:
       - State of the user.
diff --git a/lib/ansible/modules/database/postgresql/postgresql_lang.py b/lib/ansible/modules/database/postgresql/postgresql_lang.py
index 87b077ebabc..f43737c3956 100644
--- a/lib/ansible/modules/database/postgresql/postgresql_lang.py
+++ b/lib/ansible/modules/database/postgresql/postgresql_lang.py
@@ -41,7 +41,6 @@ options:
       - make this language trusted for the selected db
     type: bool
     default: 'no'
-    choices: [ "yes", "no" ]
   db:
     description:
       - name of database where the language will be added, removed or changed
diff --git a/lib/ansible/modules/files/patch.py b/lib/ansible/modules/files/patch.py
index 86fd3840f5b..42a4cade4cf 100644
--- a/lib/ansible/modules/files/patch.py
+++ b/lib/ansible/modules/files/patch.py
@@ -46,7 +46,7 @@ options:
     description:
       - If C(no), it will search for src at originating/master machine, if C(yes) it will
         go to the remote/target machine for the C(src).
-    choices: [ 'no', 'yes' ]
+    type: bool
     default: 'no'
   strip:
     description:
@@ -59,7 +59,7 @@ options:
     description:
       - Passes C(--backup --version-control=numbered) to patch,
         producing numbered backup copies.
-    choices: [ 'no', 'yes' ]
+    type: bool
     default: 'no'
   binary:
     version_added: "2.0"
@@ -67,7 +67,7 @@ options:
       - Setting to C(yes) will disable patch's heuristic for transforming CRLF
         line endings into LF. Line endings of src and dest must match. If set to
         C(no), C(patch) will replace CRLF in C(src) files on POSIX.
-    choices: [ 'no', 'yes' ]
+    type: bool
     default: 'no'
 notes:
   - This module requires GNU I(patch) utility to be installed on the remote host.
diff --git a/lib/ansible/modules/messaging/rabbitmq_exchange.py b/lib/ansible/modules/messaging/rabbitmq_exchange.py
index 385207d7ea7..9f31e57dcf9 100644
--- a/lib/ansible/modules/messaging/rabbitmq_exchange.py
+++ b/lib/ansible/modules/messaging/rabbitmq_exchange.py
@@ -64,7 +64,7 @@ options:
         description:
             - whether exchange is durable or not
         required: false
-        choices: [ "yes", "no" ]
+        type: bool
         default: yes
     exchange_type:
         description:
@@ -77,13 +77,13 @@ options:
         description:
             - if the exchange should delete itself after all queues/exchanges unbound from it
         required: false
-        choices: [ "yes", "no" ]
+        type: bool
         default: no
     internal:
         description:
             - exchange is available only for other exchanges
         required: false
-        choices: [ "yes", "no" ]
+        type: bool
         default: no
     arguments:
         description:
diff --git a/lib/ansible/modules/monitoring/airbrake_deployment.py b/lib/ansible/modules/monitoring/airbrake_deployment.py
index 8be510df033..02ebcfa66bd 100644
--- a/lib/ansible/modules/monitoring/airbrake_deployment.py
+++ b/lib/ansible/modules/monitoring/airbrake_deployment.py
@@ -54,7 +54,7 @@ options:
         on personally controlled sites using self-signed certificates.
     required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
 
 requirements: []
 '''
diff --git a/lib/ansible/modules/monitoring/bigpanda.py b/lib/ansible/modules/monitoring/bigpanda.py
index 8b2a073ad9b..c7231bf4aea 100644
--- a/lib/ansible/modules/monitoring/bigpanda.py
+++ b/lib/ansible/modules/monitoring/bigpanda.py
@@ -68,7 +68,7 @@ options:
         on personally controlled sites using self-signed certificates.
     required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
 
 # informational: requirements for nodes
 requirements: [ ]
diff --git a/lib/ansible/modules/monitoring/newrelic_deployment.py b/lib/ansible/modules/monitoring/newrelic_deployment.py
index 92b0e4e42a4..4467bb7f0f5 100644
--- a/lib/ansible/modules/monitoring/newrelic_deployment.py
+++ b/lib/ansible/modules/monitoring/newrelic_deployment.py
@@ -64,7 +64,7 @@ options:
         on personally controlled sites using self-signed certificates.
     required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
     version_added: 1.5.1
 
 requirements: []
diff --git a/lib/ansible/modules/monitoring/rollbar_deployment.py b/lib/ansible/modules/monitoring/rollbar_deployment.py
index 9b22c62646c..fdae576ddcd 100644
--- a/lib/ansible/modules/monitoring/rollbar_deployment.py
+++ b/lib/ansible/modules/monitoring/rollbar_deployment.py
@@ -59,7 +59,7 @@ options:
         self-signed certificates.
     required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/monitoring/sensu_subscription.py b/lib/ansible/modules/monitoring/sensu_subscription.py
index 8a6808a87bd..f10ff238cc6 100644
--- a/lib/ansible/modules/monitoring/sensu_subscription.py
+++ b/lib/ansible/modules/monitoring/sensu_subscription.py
@@ -40,7 +40,7 @@ options:
     description:
       - Create a backup file (if yes), including the timestamp information so you
       - can get the original file back if you somehow clobbered it incorrectly.
-    choices: [ 'yes', 'no' ]
+    type: bool
     required: false
     default: no
 requirements: [ ]
diff --git a/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py b/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
index a1f2e9eb943..ad43fa6798a 100644
--- a/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
+++ b/lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py
@@ -51,7 +51,7 @@ options:
         description:
             - Only updates an existing macro if set to C(yes).
         default: 'yes'
-        choices: ['yes', 'no']
+        type: bool
         version_added: 2.5
 
 extends_documentation_fragment:
diff --git a/lib/ansible/modules/network/aos/_aos_device.py b/lib/ansible/modules/network/aos/_aos_device.py
index f1b921812fa..298bf53d4e3 100644
--- a/lib/ansible/modules/network/aos/_aos_device.py
+++ b/lib/ansible/modules/network/aos/_aos_device.py
@@ -65,7 +65,7 @@ options:
       - The approve argument instruct the module to convert a device in quarantine
         mode into approved mode.
     default: "no"
-    choices: [ "yes", "no" ]
+    type: bool
   location:
     description:
       - When approving a device using the I(approve) argument, it's possible
diff --git a/lib/ansible/modules/network/bigswitch/bcf_switch.py b/lib/ansible/modules/network/bigswitch/bcf_switch.py
index 67f634bd103..f4fe61e6fd6 100755
--- a/lib/ansible/modules/network/bigswitch/bcf_switch.py
+++ b/lib/ansible/modules/network/bigswitch/bcf_switch.py
@@ -52,7 +52,7 @@ options:
         on personally controlled devices using self-signed certificates.
     required: false
     default: true
-    choices: [true, false]
+    type: bool
   access_token:
     description:
      - Big Cloud Fabric access token. If this isn't set then the environment variable C(BIGSWITCH_ACCESS_TOKEN) is used.
diff --git a/lib/ansible/modules/network/bigswitch/bigmon_chain.py b/lib/ansible/modules/network/bigswitch/bigmon_chain.py
index 2c6f66525e4..4a41482bffc 100755
--- a/lib/ansible/modules/network/bigswitch/bigmon_chain.py
+++ b/lib/ansible/modules/network/bigswitch/bigmon_chain.py
@@ -42,7 +42,7 @@ options:
         on personally controlled devices using self-signed certificates.
     required: false
     default: true
-    choices: [true, false]
+    type: bool
   access_token:
     description:
      - Bigmon access token. If this isn't set, the environment variable C(BIGSWITCH_ACCESS_TOKEN) is used.
diff --git a/lib/ansible/modules/network/bigswitch/bigmon_policy.py b/lib/ansible/modules/network/bigswitch/bigmon_policy.py
index 7aefc644cf1..e3a288fb170 100644
--- a/lib/ansible/modules/network/bigswitch/bigmon_policy.py
+++ b/lib/ansible/modules/network/bigswitch/bigmon_policy.py
@@ -67,7 +67,7 @@ options:
        on personally controlled devices using self-signed certificates.
     required: false
     default: true
-    choices: [true, false]
+    type: bool
   access_token:
     description:
      - Bigmon access token. If this isn't set, the environment variable C(BIGSWITCH_ACCESS_TOKEN) is used.
diff --git a/lib/ansible/modules/network/f5/bigip_asm_policy.py b/lib/ansible/modules/network/f5/bigip_asm_policy.py
index 17be58feb17..0a8cb033037 100644
--- a/lib/ansible/modules/network/f5/bigip_asm_policy.py
+++ b/lib/ansible/modules/network/f5/bigip_asm_policy.py
@@ -26,9 +26,7 @@ options:
         deactivate existing active policy. Generally should be C(yes) only in cases where
         you want to activate new or existing policy.
     default: no
-    choices:
-      - yes
-      - no
+    type: bool
   name:
     description:
       - The ASM policy to manage or create.
diff --git a/lib/ansible/modules/network/f5/bigip_configsync_action.py b/lib/ansible/modules/network/f5/bigip_configsync_action.py
index 91cc0d0e27f..1d071fdac1a 100644
--- a/lib/ansible/modules/network/f5/bigip_configsync_action.py
+++ b/lib/ansible/modules/network/f5/bigip_configsync_action.py
@@ -32,26 +32,20 @@ options:
         device to other members of the device group. In this case, the device
         will do a "push" to all the other devices in the group. This option
         is mutually exclusive with the C(sync_group_to_device) option.
-    choices:
-      - yes
-      - no
+    type: bool
   sync_most_recent_to_device:
     description:
       - Specifies that the system synchronizes configuration data from the
         device with the most recent configuration. In this case, the device
         will do a "pull" from the most recently updated device. This option
         is mutually exclusive with the C(sync_device_to_group) options.
-    choices:
-      - yes
-      - no
+    type: bool
   overwrite_config:
     description:
       - Indicates that the sync operation overwrites the configuration on
         the target.
     default: no
-    choices:
-      - yes
-      - no
+    type: bool
 notes:
   - Requires the objectpath Python package on the host. This is as easy as
     C(pip install objectpath).
diff --git a/lib/ansible/modules/network/f5/bigip_device_connectivity.py b/lib/ansible/modules/network/f5/bigip_device_connectivity.py
index eed515449aa..4cd0bfddacc 100644
--- a/lib/ansible/modules/network/f5/bigip_device_connectivity.py
+++ b/lib/ansible/modules/network/f5/bigip_device_connectivity.py
@@ -50,9 +50,7 @@ options:
         C(multicast_interface), C(multicast_address) and C(multicast_port) are
         the defaults specified in each option's description. When C(no), ensures
         that Failover Multicast configuration is disabled.
-    choices:
-      - yes
-      - no
+    type: bool
   multicast_interface:
     description:
       - Interface over which the system sends multicast messages associated
diff --git a/lib/ansible/modules/network/f5/bigip_pool_member.py b/lib/ansible/modules/network/f5/bigip_pool_member.py
index cc7107225a0..5e6407c9722 100644
--- a/lib/ansible/modules/network/f5/bigip_pool_member.py
+++ b/lib/ansible/modules/network/f5/bigip_pool_member.py
@@ -91,11 +91,9 @@ options:
     description:
       - When state is absent and the pool member is no longer referenced
         in other pools, the default behavior removes the unused node
-        o bject. Setting this to 'yes' disables this behavior.
+        object. Setting this to 'yes' disables this behavior.
     default: no
-    choices:
-      - yes
-      - no
+    type: bool
     version_added: 2.1
   priority_group:
     description:
diff --git a/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py b/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py
index 49f2f2fd6dc..e5844aa2784 100644
--- a/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py
+++ b/lib/ansible/modules/network/fortios/fortios_ipv4_policy.py
@@ -53,7 +53,7 @@ options:
     description:
       - Negate source address param.
     default: false
-    choices: ["true", "false"]
+    type: bool
   dst_addr:
     description:
       - Specifies destination address (or group) object name(s). Required when I(state=present).
@@ -61,7 +61,7 @@ options:
     description:
       - Negate destination address param.
     default: false
-    choices: ["true", "false"]
+    type: bool
   policy_action:
     description:
       - Specifies accept or deny action policy. Required when I(state=present).
@@ -76,7 +76,7 @@ options:
     description:
       - Negate policy service(s) defined in service value.
     default: false
-    choices: ["true", "false"]
+    type: bool
   schedule:
     description:
       - defines policy schedule.
@@ -85,12 +85,12 @@ options:
     description:
       - Enable or disable Nat.
     default: false
-    choices: ["true", "false"]
+    type: bool
   fixedport:
     description:
       - Use fixed port for nat.
     default: false
-    choices: ["true", "false"]
+    type: bool
   poolname:
     description:
       - Specifies NAT pool name.
@@ -117,7 +117,7 @@ options:
     description:
       - Logs beginning of session as well.
     default: false
-    choices: ["true", "false"]
+    type: bool
   comment:
     description:
       - free text to describe policy.
diff --git a/lib/ansible/modules/network/illumos/dladm_etherstub.py b/lib/ansible/modules/network/illumos/dladm_etherstub.py
index 9152fb3b5ab..f4db7e198dc 100644
--- a/lib/ansible/modules/network/illumos/dladm_etherstub.py
+++ b/lib/ansible/modules/network/illumos/dladm_etherstub.py
@@ -32,7 +32,7 @@ options:
               do not persist across reboots.
         required: false
         default: false
-        choices: [ "true", "false" ]
+        type: bool
     state:
         description:
             - Create or delete Solaris/illumos etherstub.
diff --git a/lib/ansible/modules/network/illumos/dladm_vnic.py b/lib/ansible/modules/network/illumos/dladm_vnic.py
index 72b4b35635c..ce4b4d9e185 100644
--- a/lib/ansible/modules/network/illumos/dladm_vnic.py
+++ b/lib/ansible/modules/network/illumos/dladm_vnic.py
@@ -37,7 +37,7 @@ options:
               do not persist across reboots.
         required: false
         default: false
-        choices: [ "true", "false" ]
+        type: bool
     mac:
         description:
             - Sets the VNIC's MAC address. Must be valid unicast MAC address.
diff --git a/lib/ansible/modules/network/illumos/flowadm.py b/lib/ansible/modules/network/illumos/flowadm.py
index bc37102a1f0..184efc3853d 100644
--- a/lib/ansible/modules/network/illumos/flowadm.py
+++ b/lib/ansible/modules/network/illumos/flowadm.py
@@ -75,7 +75,7 @@ options:
               flows do not persist across reboots.
         required: false
         default: false
-        choices: [ "true", "false" ]
+        type: bool
     state:
         description:
             - Create/delete/enable/disable an IP address on the network interface.
diff --git a/lib/ansible/modules/network/illumos/ipadm_if.py b/lib/ansible/modules/network/illumos/ipadm_if.py
index 7e40c8c0859..61646ed9bef 100644
--- a/lib/ansible/modules/network/illumos/ipadm_if.py
+++ b/lib/ansible/modules/network/illumos/ipadm_if.py
@@ -33,7 +33,7 @@ options:
               interfaces do not persist across reboots.
         required: false
         default: false
-        choices: [ "true", "false" ]
+        type: bool
     state:
         description:
             - Create or delete Solaris/illumos IP interfaces.
diff --git a/lib/ansible/modules/network/illumos/ipadm_prop.py b/lib/ansible/modules/network/illumos/ipadm_prop.py
index 4fd0bb1072c..cc874ab2649 100644
--- a/lib/ansible/modules/network/illumos/ipadm_prop.py
+++ b/lib/ansible/modules/network/illumos/ipadm_prop.py
@@ -40,7 +40,7 @@ options:
               property values do not persist across reboots.
         required: false
         default: false
-        choices: [ "true", "false" ]
+        type: bool
     state:
         description:
             - Set or reset the property value.
diff --git a/lib/ansible/modules/network/junos/junos_interface.py b/lib/ansible/modules/network/junos/junos_interface.py
index aecf914a65f..3a3950e2a26 100644
--- a/lib/ansible/modules/network/junos/junos_interface.py
+++ b/lib/ansible/modules/network/junos/junos_interface.py
@@ -83,7 +83,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_l2_interface.py b/lib/ansible/modules/network/junos/junos_l2_interface.py
index 23de9b19156..d9068301ec6 100644
--- a/lib/ansible/modules/network/junos/junos_l2_interface.py
+++ b/lib/ansible/modules/network/junos/junos_l2_interface.py
@@ -62,7 +62,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_l3_interface.py b/lib/ansible/modules/network/junos/junos_l3_interface.py
index 765258bd84c..a903533c38d 100644
--- a/lib/ansible/modules/network/junos/junos_l3_interface.py
+++ b/lib/ansible/modules/network/junos/junos_l3_interface.py
@@ -47,7 +47,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_linkagg.py b/lib/ansible/modules/network/junos/junos_linkagg.py
index 85ad8481c0c..d66af100a53 100644
--- a/lib/ansible/modules/network/junos/junos_linkagg.py
+++ b/lib/ansible/modules/network/junos/junos_linkagg.py
@@ -62,7 +62,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_lldp.py b/lib/ansible/modules/network/junos/junos_lldp.py
index 989dbe5f71a..05c05854f9f 100644
--- a/lib/ansible/modules/network/junos/junos_lldp.py
+++ b/lib/ansible/modules/network/junos/junos_lldp.py
@@ -49,7 +49,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_lldp_interface.py b/lib/ansible/modules/network/junos/junos_lldp_interface.py
index a5c90b4469e..af4a7f59488 100644
--- a/lib/ansible/modules/network/junos/junos_lldp_interface.py
+++ b/lib/ansible/modules/network/junos/junos_lldp_interface.py
@@ -38,7 +38,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_logging.py b/lib/ansible/modules/network/junos/junos_logging.py
index afc8a422ca2..ec6540ea2d5 100644
--- a/lib/ansible/modules/network/junos/junos_logging.py
+++ b/lib/ansible/modules/network/junos/junos_logging.py
@@ -49,7 +49,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
   rotate_frequency:
     description:
       - Rotate log frequency in minutes, this is applicable if value
diff --git a/lib/ansible/modules/network/junos/junos_static_route.py b/lib/ansible/modules/network/junos/junos_static_route.py
index 75465d051a9..464dfe46409 100644
--- a/lib/ansible/modules/network/junos/junos_static_route.py
+++ b/lib/ansible/modules/network/junos/junos_static_route.py
@@ -54,7 +54,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_system.py b/lib/ansible/modules/network/junos/junos_system.py
index 39702572c14..2def0ec8b2f 100644
--- a/lib/ansible/modules/network/junos/junos_system.py
+++ b/lib/ansible/modules/network/junos/junos_system.py
@@ -59,7 +59,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_vlan.py b/lib/ansible/modules/network/junos/junos_vlan.py
index a9230bf4e1a..dda860518db 100644
--- a/lib/ansible/modules/network/junos/junos_vlan.py
+++ b/lib/ansible/modules/network/junos/junos_vlan.py
@@ -48,7 +48,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/junos/junos_vrf.py b/lib/ansible/modules/network/junos/junos_vrf.py
index a5eacc6ee70..d35e17bfc15 100644
--- a/lib/ansible/modules/network/junos/junos_vrf.py
+++ b/lib/ansible/modules/network/junos/junos_vrf.py
@@ -54,6 +54,7 @@ options:
       - Causes JUNOS to allocate a VPN label per VRF rather than per VPN FEC.
         This allows for forwarding of traffic to directly connected subnets, COS
         Egress filtering etc.
+    type: bool
   aggregate:
     description:
       - The set of VRF definition objects to be configured on the remote
@@ -73,7 +74,7 @@ options:
     description:
       - Specifies whether or not the configuration is active or deactivated
     default: True
-    choices: [True, False]
+    type: bool
 requirements:
   - ncclient (>=v0.5.2)
 notes:
diff --git a/lib/ansible/modules/network/nxos/nxos_evpn_global.py b/lib/ansible/modules/network/nxos/nxos_evpn_global.py
index 3e426483529..ed5fa8f22df 100644
--- a/lib/ansible/modules/network/nxos/nxos_evpn_global.py
+++ b/lib/ansible/modules/network/nxos/nxos_evpn_global.py
@@ -36,7 +36,7 @@ options:
     description:
       - EVPN control plane.
     required: true
-    choices: ['true', 'false']
+    type: bool
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/network/nxos/nxos_nxapi.py b/lib/ansible/modules/network/nxos/nxos_nxapi.py
index 63935e144c3..1549167a0c7 100644
--- a/lib/ansible/modules/network/nxos/nxos_nxapi.py
+++ b/lib/ansible/modules/network/nxos/nxos_nxapi.py
@@ -51,7 +51,7 @@ options:
         argument to False.
     required: false
     default: yes
-    choices: ['yes', 'no']
+    type: bool
     aliases: ['enable_http']
   https_port:
     description:
@@ -70,7 +70,7 @@ options:
         argument to True.
     required: false
     default: no
-    choices: ['yes', 'no']
+    type: bool
     aliases: ['enable_https']
   sandbox:
     description:
@@ -82,7 +82,7 @@ options:
         sandbox URL is unavailable. This is supported on NX-OS 7K series.
     required: false
     default: no
-    choices: ['yes', 'no']
+    type: bool
     aliases: ['enable_sandbox']
   state:
     description:
diff --git a/lib/ansible/modules/network/onyx/onyx_config.py b/lib/ansible/modules/network/onyx/onyx_config.py
index 4d6e527fa43..58dd8f153fe 100644
--- a/lib/ansible/modules/network/onyx/onyx_config.py
+++ b/lib/ansible/modules/network/onyx/onyx_config.py
@@ -87,7 +87,7 @@ options:
         folder in the playbook root directory.  If the directory does not
         exist, it is created.
     default: no
-    choices: ['yes', 'no']
+    type: bool
   config:
     description:
       - The C(config) argument allows the playbook designer to supply
@@ -100,7 +100,7 @@ options:
         config to the startup-config at the conclusion of the module
         running.  If check mode is specified, this argument is ignored.
     default: no
-    choices: ['yes', 'no']
+    type: bool
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/notification/bearychat.py b/lib/ansible/modules/notification/bearychat.py
index 37559e64cf3..eb03f204a31 100644
--- a/lib/ansible/modules/notification/bearychat.py
+++ b/lib/ansible/modules/notification/bearychat.py
@@ -47,8 +47,7 @@ options:
     description:
       - If C(yes), text will be parsed as markdown.
     default: 'yes'
-    choices:
-      - 'yes'
+    type: bool
   channel:
     description:
       - Channel to send the message to. If absent, the message goes to the
diff --git a/lib/ansible/modules/notification/flowdock.py b/lib/ansible/modules/notification/flowdock.py
index 7e41e663b1c..ded1c1bd92e 100644
--- a/lib/ansible/modules/notification/flowdock.py
+++ b/lib/ansible/modules/notification/flowdock.py
@@ -77,7 +77,7 @@ options:
         on personally controlled sites using self-signed certificates.
     required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
     version_added: 1.5.1
 
 requirements: [ ]
diff --git a/lib/ansible/modules/notification/grove.py b/lib/ansible/modules/notification/grove.py
index d28e780358a..45225fec019 100644
--- a/lib/ansible/modules/notification/grove.py
+++ b/lib/ansible/modules/notification/grove.py
@@ -47,9 +47,8 @@ options:
     description:
       - If C(no), SSL certificates will not be validated. This should only be used
         on personally controlled sites using self-signed certificates.
-    required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
     version_added: 1.5.1
 author: "Jonas Pfenniger (@zimbatm)"
 '''
diff --git a/lib/ansible/modules/notification/mattermost.py b/lib/ansible/modules/notification/mattermost.py
index 6e9b03ba9a2..d53522eac12 100644
--- a/lib/ansible/modules/notification/mattermost.py
+++ b/lib/ansible/modules/notification/mattermost.py
@@ -58,9 +58,7 @@ options:
       - If C(no), SSL certificates will not be validated. This should only be used
         on personally controlled sites using self-signed certificates.
     default: yes
-    choices:
-      - 'yes'
-      - 'no'
+    type: bool
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/notification/nexmo.py b/lib/ansible/modules/notification/nexmo.py
index 38a5862e52f..c2397f65ba8 100644
--- a/lib/ansible/modules/notification/nexmo.py
+++ b/lib/ansible/modules/notification/nexmo.py
@@ -46,11 +46,8 @@ options:
     description:
       - If C(no), SSL certificates will not be validated. This should only be used
         on personally controlled sites using self-signed certificates.
-    required: false
+    type: bool
     default: 'yes'
-    choices:
-      - 'yes'
-      - 'no'
 extends_documentation_fragment:
   - url
 """
diff --git a/lib/ansible/modules/packaging/language/composer.py b/lib/ansible/modules/packaging/language/composer.py
index 54c4adfbb0b..437662d729b 100644
--- a/lib/ansible/modules/packaging/language/composer.py
+++ b/lib/ansible/modules/packaging/language/composer.py
@@ -51,38 +51,38 @@ options:
         version_added: "2.4"
         description:
             - Runs the specified command globally.
-        choices: [ true, false]
+        type: bool
         default: false
         aliases: [ global-command ]
     prefer_source:
         description:
             - Forces installation from package sources when possible (see --prefer-source).
         default: false
-        choices: [ true, false]
+        type: bool
         aliases: [ prefer-source ]
     prefer_dist:
         description:
             - Forces installation from package dist even for dev versions (see --prefer-dist).
         default: false
-        choices: [ true, false]
+        type: bool
         aliases: [ prefer-dist ]
     no_dev:
         description:
             - Disables installation of require-dev packages (see --no-dev).
         default: true
-        choices: [ true, false]
+        type: bool
         aliases: [ no-dev ]
     no_scripts:
         description:
             - Skips the execution of all scripts defined in composer.json (see --no-scripts).
         default: false
-        choices: [ true, false]
+        type: bool
         aliases: [ no-scripts ]
     no_plugins:
         description:
             - Disables all plugins ( see --no-plugins ).
         default: false
-        choices: [ true, false]
+        type: bool
         aliases: [ no-plugins ]
     optimize_autoloader:
         description:
@@ -90,14 +90,14 @@ options:
             - Convert PSR-0/4 autoloading to classmap to get a faster autoloader.
             - Recommended especially for production, but can take a bit of time to run.
         default: true
-        choices: [ true, false]
+        type: bool
         aliases: [ optimize-autoloader ]
     ignore_platform_reqs:
         version_added: "2.0"
         description:
             - Ignore php, hhvm, lib-* and ext-* requirements and force the installation even if the local machine does not fulfill these.
         default: false
-        choices: [ true, false]
+        type: bool
         aliases: [ ignore-platform-reqs ]
 requirements:
     - php
diff --git a/lib/ansible/modules/packaging/language/gem.py b/lib/ansible/modules/packaging/language/gem.py
index 4e270040243..57ffc239df4 100644
--- a/lib/ansible/modules/packaging/language/gem.py
+++ b/lib/ansible/modules/packaging/language/gem.py
@@ -39,7 +39,7 @@ options:
     description:
       - Whether to include dependencies or not.
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: "yes"
   repository:
     description:
@@ -50,7 +50,7 @@ options:
     description:
       - Install gem in user's local gems cache or for all users
     required: false
-    choices: ["yes", "no"]
+    type: bool
     default: "yes"
     version_added: "1.3"
   executable:
diff --git a/lib/ansible/modules/packaging/language/npm.py b/lib/ansible/modules/packaging/language/npm.py
index 331265dde1b..2f871b2f970 100644
--- a/lib/ansible/modules/packaging/language/npm.py
+++ b/lib/ansible/modules/packaging/language/npm.py
@@ -40,7 +40,7 @@ options:
       - Install the node.js library globally
     required: false
     default: no
-    choices: [ "yes", "no" ]
+    type: bool
   executable:
     description:
       - The executable location for npm.
@@ -48,16 +48,16 @@ options:
     required: false
   ignore_scripts:
     description:
-      - Use the --ignore-scripts flag when installing.
+      - Use the C(--ignore-scripts) flag when installing.
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: no
     version_added: "1.8"
   production:
     description:
       - Install dependencies in production mode, excluding devDependencies
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: no
   registry:
     description:
diff --git a/lib/ansible/modules/packaging/os/macports.py b/lib/ansible/modules/packaging/os/macports.py
index 4d2b6f18d16..930b300db85 100644
--- a/lib/ansible/modules/packaging/os/macports.py
+++ b/lib/ansible/modules/packaging/os/macports.py
@@ -33,15 +33,12 @@ options:
         description:
             - state of the package
         choices: [ 'present', 'absent', 'active', 'inactive' ]
-        required: false
         default: present
     update_cache:
         description:
             - update the package db first
-        required: false
         default: "no"
-        choices: [ "yes", "no" ]
-notes:  []
+        type: bool
 '''
 EXAMPLES = '''
 - macports:
diff --git a/lib/ansible/modules/packaging/os/opkg.py b/lib/ansible/modules/packaging/os/opkg.py
index 8a4863d7212..265fed8abcd 100644
--- a/lib/ansible/modules/packaging/os/opkg.py
+++ b/lib/ansible/modules/packaging/os/opkg.py
@@ -32,7 +32,6 @@ options:
         description:
             - state of the package
         choices: [ 'present', 'absent' ]
-        required: false
         default: present
     force:
         description:
@@ -49,16 +48,13 @@ options:
             - "remove"
             - "checksum"
             - "removal-of-dependent-packages"
-        required: false
         default: absent
         version_added: "2.0"
     update_cache:
         description:
             - update the package db first
-        required: false
         default: "no"
-        choices: [ "yes", "no" ]
-notes:  []
+        type: bool
 requirements:
     - opkg
     - python
diff --git a/lib/ansible/modules/packaging/os/pkgng.py b/lib/ansible/modules/packaging/os/pkgng.py
index a6e80ca9d01..d921962b3ab 100644
--- a/lib/ansible/modules/packaging/os/pkgng.py
+++ b/lib/ansible/modules/packaging/os/pkgng.py
@@ -39,7 +39,7 @@ options:
     cached:
         description:
             - Use local package base instead of fetching an updated one.
-        choices: [ 'yes', 'no' ]
+        type: bool
         required: false
         default: no
     annotation:
@@ -81,7 +81,7 @@ options:
         description:
             - Remove automatically installed packages which are no longer needed.
         required: false
-        choices: [ "yes", "no" ]
+        type: bool
         default: no
 author: "bleader (@bleader)"
 notes:
diff --git a/lib/ansible/modules/packaging/os/portinstall.py b/lib/ansible/modules/packaging/os/portinstall.py
index fd099fe522c..20114bcd0a9 100644
--- a/lib/ansible/modules/packaging/os/portinstall.py
+++ b/lib/ansible/modules/packaging/os/portinstall.py
@@ -37,7 +37,7 @@ options:
     use_packages:
         description:
             - use packages instead of ports whenever available
-        choices: [ 'yes', 'no' ]
+        type: bool
         required: false
         default: yes
 author: "berenddeboer (@berenddeboer)"
diff --git a/lib/ansible/modules/packaging/os/slackpkg.py b/lib/ansible/modules/packaging/os/slackpkg.py
index 386275b4614..5d27544d8ba 100644
--- a/lib/ansible/modules/packaging/os/slackpkg.py
+++ b/lib/ansible/modules/packaging/os/slackpkg.py
@@ -45,7 +45,7 @@ options:
             - update the package database first
         required: false
         default: false
-        choices: [ true, false ]
+        type: bool
 
 author: Kim Nørgaard (@KimNorgaard)
 requirements: [ "Slackware >= 12.2" ]
diff --git a/lib/ansible/modules/packaging/os/svr4pkg.py b/lib/ansible/modules/packaging/os/svr4pkg.py
index 5709a16b54c..5dc28160df2 100644
--- a/lib/ansible/modules/packaging/os/svr4pkg.py
+++ b/lib/ansible/modules/packaging/os/svr4pkg.py
@@ -64,7 +64,7 @@ options:
     description:
       - Install/Remove category instead of a single package.
     required: false
-    choices: ["true", "false"]
+    type: bool
     version_added: "1.6"
 '''
 
diff --git a/lib/ansible/modules/packaging/os/yum.py b/lib/ansible/modules/packaging/os/yum.py
index ae9f2d1239a..6f2227d78e8 100644
--- a/lib/ansible/modules/packaging/os/yum.py
+++ b/lib/ansible/modules/packaging/os/yum.py
@@ -101,8 +101,7 @@ options:
       - Has an effect only if state is I(latest)
     required: false
     default: "no"
-    choices: ["yes", "no"]
-    aliases: []
+    type: bool
     version_added: "2.5"
 
   installroot:
diff --git a/lib/ansible/modules/packaging/os/zypper.py b/lib/ansible/modules/packaging/os/zypper.py
index e089eb522b2..dacd35f7d6c 100644
--- a/lib/ansible/modules/packaging/os/zypper.py
+++ b/lib/ansible/modules/packaging/os/zypper.py
@@ -75,7 +75,7 @@ options:
             I(present) or I(latest).
         required: false
         default: "no"
-        choices: [ "yes", "no" ]
+        type: bool
     disable_recommends:
         version_added: "1.8"
         description:
@@ -83,21 +83,21 @@ options:
             install recommended packages.
         required: false
         default: "yes"
-        choices: [ "yes", "no" ]
+        type: bool
     force:
         version_added: "2.2"
         description:
           - Adds C(--force) option to I(zypper). Allows to downgrade packages and change vendor or architecture.
         required: false
         default: "no"
-        choices: [ "yes", "no" ]
+        type: bool
     update_cache:
         version_added: "2.2"
         description:
           - Run the equivalent of C(zypper refresh) before the operation. Disabled in check mode.
         required: false
         default: "no"
-        choices: [ "yes", "no" ]
+        type: bool
         aliases: [ "refresh" ]
     oldpackage:
         version_added: "2.2"
@@ -106,7 +106,7 @@ options:
             version is specified as part of the package name.
         required: false
         default: "no"
-        choices: [ "yes", "no" ]
+        type: bool
     extra_args:
         version_added: "2.4"
         required: false
diff --git a/lib/ansible/modules/remote_management/hpilo/hpilo_boot.py b/lib/ansible/modules/remote_management/hpilo/hpilo_boot.py
index 09a7cae62e3..7c321263f1e 100755
--- a/lib/ansible/modules/remote_management/hpilo/hpilo_boot.py
+++ b/lib/ansible/modules/remote_management/hpilo/hpilo_boot.py
@@ -64,7 +64,7 @@ options:
     - Whether to force a reboot (even when the system is already booted).
     - As a safeguard, without force, hpilo_boot will refuse to reboot a server that is already running.
     default: no
-    choices: [ "yes", "no" ]
+    type: bool
   ssl_version:
     description:
       - Change the ssl_version used.
diff --git a/lib/ansible/modules/source_control/github_hooks.py b/lib/ansible/modules/source_control/github_hooks.py
index e1480f668e1..df0f0f2199b 100644
--- a/lib/ansible/modules/source_control/github_hooks.py
+++ b/lib/ansible/modules/source_control/github_hooks.py
@@ -50,7 +50,7 @@ options:
         on personally controlled sites using self-signed certificates.
     required: false
     default: 'yes'
-    choices: ['yes', 'no']
+    type: bool
   content_type:
     description:
       - Content type to use for requests made to the webhook
diff --git a/lib/ansible/modules/storage/infinidat/infini_export_client.py b/lib/ansible/modules/storage/infinidat/infini_export_client.py
index 80f0a0f4794..d1e3d6a5a0e 100644
--- a/lib/ansible/modules/storage/infinidat/infini_export_client.py
+++ b/lib/ansible/modules/storage/infinidat/infini_export_client.py
@@ -43,7 +43,7 @@ options:
   no_root_squash:
     description:
       - Don't squash root user to anonymous. Will be set to "no" on creation if not specified explicitly.
-    choices: [ "yes", "no" ]
+    type: bool
     default: no
     required: false
   export:
diff --git a/lib/ansible/modules/storage/infinidat/infini_pool.py b/lib/ansible/modules/storage/infinidat/infini_pool.py
index da0068a73bb..0c7ecabe053 100644
--- a/lib/ansible/modules/storage/infinidat/infini_pool.py
+++ b/lib/ansible/modules/storage/infinidat/infini_pool.py
@@ -49,7 +49,7 @@ options:
       - Enable/Disable SSD Cache on Pool
     required: false
     default: yes
-    choices: [ "yes", "no" ]
+    type: bool
 notes:
   - Infinibox Admin level access is required for pool modifications
 extends_documentation_fragment:
diff --git a/lib/ansible/modules/storage/netapp/netapp_e_amg_role.py b/lib/ansible/modules/storage/netapp/netapp_e_amg_role.py
index 42a58a8fb8f..71acf5a555a 100644
--- a/lib/ansible/modules/storage/netapp/netapp_e_amg_role.py
+++ b/lib/ansible/modules/storage/netapp/netapp_e_amg_role.py
@@ -52,7 +52,7 @@ options:
             - Whether to avoid synchronization prior to role reversal
         required: no
         default: no
-        choices: [yes, no]
+        type: bool
     force:
         description:
             - Whether to force the role reversal regardless of the online-state of the primary
diff --git a/lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py b/lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py
index 42fb9c64fba..5b747193a91 100644
--- a/lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py
+++ b/lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py
@@ -63,9 +63,7 @@ options:
             - If false, the synchronization will be suspended if the amount of unsynchronized data exceeds the CoW Repository capacity on the secondary
               and the failures point will be preserved.
             - "NOTE: This only has impact for newly launched syncs."
-        choices:
-            - yes
-            - no
+        type: bool
         default: no
 """
 EXAMPLES = """
diff --git a/lib/ansible/modules/storage/netapp/netapp_e_storagepool.py b/lib/ansible/modules/storage/netapp/netapp_e_storagepool.py
index 40076b5598b..6643c0db1c7 100644
--- a/lib/ansible/modules/storage/netapp/netapp_e_storagepool.py
+++ b/lib/ansible/modules/storage/netapp/netapp_e_storagepool.py
@@ -64,12 +64,12 @@ options:
     - "Only required when the requested state is 'present'.  The RAID level of the storage pool to be created."
   erase_secured_drives:
     required: false
-    choices: ['true', 'false']
+    type: bool
     description:
     - Whether to erase secured disks before adding to storage pool
   secure_pool:
     required: false
-    choices: ['true', 'false']
+    type: bool
     description:
     - Whether to convert to a secure storage pool. Will only work if all drives in the pool are security capable.
   reserve_drive_count:
diff --git a/lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py b/lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py
index c6c85cc13b1..dec33f05da8 100644
--- a/lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py
+++ b/lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py
@@ -65,7 +65,7 @@ options:
         description:
             - Defines if a copy pair will be created if it does not exist.
             - If set to True destination_volume_id and source_volume_id are required.
-        choices: [True, False]
+        type: bool
         default: True
     start_stop_copy:
         description:
diff --git a/lib/ansible/modules/system/beadm.py b/lib/ansible/modules/system/beadm.py
index 477727a9bbc..d7cb03f4df3 100644
--- a/lib/ansible/modules/system/beadm.py
+++ b/lib/ansible/modules/system/beadm.py
@@ -63,7 +63,7 @@ options:
             - Specifies if the unmount should be forced.
         required: false
         default: false
-        choices: [ "true", "false" ]
+        type: bool
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/system/mksysb.py b/lib/ansible/modules/system/mksysb.py
index a2ac7b8c904..2306d9ca958 100644
--- a/lib/ansible/modules/system/mksysb.py
+++ b/lib/ansible/modules/system/mksysb.py
@@ -27,32 +27,32 @@ options:
   backup_crypt_files:
     description:
       - Backup encrypted files.
-    choices: ["yes", "no"]
+    type: bool
     default: "yes"
   backup_dmapi_fs:
     description:
       - Back up DMAPI filesystem files.
-    choices: ["yes", "no"]
+    type: bool
     default: "yes"
   create_map_files:
     description:
       - Creates a new MAP files.
-    choices: ["yes", "no"]
+    type: bool
     default: "no"
   exclude_files:
     description:
       - Excludes files using C(/etc/rootvg.exclude).
-    choices: ["yes", "no"]
+    type: bool
     default: "no"
   exclude_wpar_files:
     description:
       - Excludes WPAR files.
-    choices: ["yes", "no"]
+    type: bool
     default: "no"
   extended_attrs:
     description:
       - Backup extended attributes.
-    choices: ["yes", "no"]
+    type: bool
     default: "yes"
   name:
     description:
@@ -61,13 +61,13 @@ options:
   new_image_data:
     description:
       - Creates a new file data.
-    choices: ["yes", "no"]
+    type: bool
     default: "yes"
   software_packing:
     description:
       - Exclude files from packing option listed in
         C(/etc/exclude_packing.rootvg).
-    choices: ["yes", "no"]
+    type: bool
     default: "no"
   storage_path:
     description:
@@ -76,7 +76,7 @@ options:
   use_snapshot:
     description:
       - Creates backup using snapshots.
-    choices: ["yes", "no"]
+    type: bool
     default: "no"
 '''
 
diff --git a/lib/ansible/modules/system/mount.py b/lib/ansible/modules/system/mount.py
index 2d36b6ac063..f557863c57e 100644
--- a/lib/ansible/modules/system/mount.py
+++ b/lib/ansible/modules/system/mount.py
@@ -89,7 +89,7 @@ options:
       - Create a backup file including the timestamp information so you can get
         the original file back if you somehow clobbered it incorrectly.
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: "no"
     version_added: '2.5'
 notes:
diff --git a/lib/ansible/modules/system/nosh.py b/lib/ansible/modules/system/nosh.py
index 5d58c622400..a9f50f3b6a7 100644
--- a/lib/ansible/modules/system/nosh.py
+++ b/lib/ansible/modules/system/nosh.py
@@ -39,14 +39,14 @@ options:
               enabled or not.
     enabled:
         required: false
-        choices: [ "yes", "no" ]
+        type: bool
         description:
             - Enable or disable the service, independently of C(*.preset) file
               preference or running state. Mutually exclusive with I(preset). Will take
               effect prior to I(state=reset).
     preset:
         required: false
-        choices: [ "yes", "no" ]
+        type: bool
         description:
             - Enable or disable the service according to local preferences in *.preset files.
               Mutually exclusive with I(enabled). Only has an effect if set to true. Will take
@@ -54,7 +54,7 @@ options:
     user:
         required: false
         default: 'no'
-        choices: [ "yes", "no" ]
+        type: bool
         description:
             - Run system-control talking to the calling user's service manager, rather than
               the system-wide service manager.
diff --git a/lib/ansible/modules/system/open_iscsi.py b/lib/ansible/modules/system/open_iscsi.py
index e7830d68ff5..e7295f49fb1 100644
--- a/lib/ansible/modules/system/open_iscsi.py
+++ b/lib/ansible/modules/system/open_iscsi.py
@@ -41,7 +41,7 @@ options:
         - the iscsi target name
     login:
         required: false
-        choices: [true, false]
+        type: bool
         description:
         - whether the target node should be connected
     node_auth:
@@ -60,12 +60,12 @@ options:
     auto_node_startup:
         aliases: [automatic]
         required: false
-        choices: [true, false]
+        type: bool
         description:
         - whether the target node should be automatically connected at startup
     discover:
         required: false
-        choices: [true, false]
+        type: bool
         description:
         - whether the list of target nodes on the portal should be
           (re)discovered and added to the persistent iscsi database.
@@ -74,7 +74,7 @@ options:
           a changed state.
     show_nodes:
         required: false
-        choices: [true, false]
+        type: bool
         description:
         - whether the list of nodes in the persistent iscsi database should be
           returned by the module
diff --git a/lib/ansible/modules/system/pam_limits.py b/lib/ansible/modules/system/pam_limits.py
index 9a33f305eb9..ee5b61bc3cb 100644
--- a/lib/ansible/modules/system/pam_limits.py
+++ b/lib/ansible/modules/system/pam_limits.py
@@ -65,7 +65,7 @@ options:
       - Create a backup file including the timestamp information so you can get
         the original file back if you somehow clobbered it incorrectly.
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: "no"
   use_min:
     description:
@@ -73,7 +73,7 @@ options:
         If the specified value is inferior to the value in the file, file content is replaced with the new value,
         else content is not modified.
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: "no"
   use_max:
     description:
@@ -81,7 +81,7 @@ options:
         If the specified value is superior to the value in the file, file content is replaced with the new value,
         else content is not modified.
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: "no"
   dest:
     description:
diff --git a/lib/ansible/modules/web_infrastructure/apache2_module.py b/lib/ansible/modules/web_infrastructure/apache2_module.py
index 3a9ae568a87..cdbfe988508 100644
--- a/lib/ansible/modules/web_infrastructure/apache2_module.py
+++ b/lib/ansible/modules/web_infrastructure/apache2_module.py
@@ -40,7 +40,7 @@ options:
      description:
         - Force disabling of default modules and override Debian warnings.
      required: false
-     choices: ['True', 'False']
+     type: bool
      default: False
      version_added: "2.1"
    state:
@@ -51,7 +51,7 @@ options:
    ignore_configcheck:
      description:
         - Ignore configuration checks about inconsistent module configuration. Especially for mpm_* modules.
-     choices: ['True', 'False']
+     type: bool
      default: False
      version_added: "2.3"
 requirements: ["a2enmod","a2dismod"]
diff --git a/lib/ansible/modules/web_infrastructure/django_manage.py b/lib/ansible/modules/web_infrastructure/django_manage.py
index dafa698951d..c73bd9c4178 100644
--- a/lib/ansible/modules/web_infrastructure/django_manage.py
+++ b/lib/ansible/modules/web_infrastructure/django_manage.py
@@ -63,7 +63,7 @@ options:
       - Fail the command immediately if a test fails. Used by the 'test' command.
     required: false
     default: "no"
-    choices: [ "yes", "no" ]
+    type: bool
   fixtures:
     description:
       - A space-delimited list of fixture file names to load in the database. B(Required) by the 'loaddata' command.
diff --git a/lib/ansible/modules/web_infrastructure/ejabberd_user.py b/lib/ansible/modules/web_infrastructure/ejabberd_user.py
index f7c804cf0aa..93383c0365f 100644
--- a/lib/ansible/modules/web_infrastructure/ejabberd_user.py
+++ b/lib/ansible/modules/web_infrastructure/ejabberd_user.py
@@ -41,7 +41,7 @@ options:
             - enables or disables the local syslog facility for this module
         required: false
         default: false
-        choices: [ 'true', 'false', 'yes', 'no' ]
+        type: bool
     state:
         description:
             - describe the desired state of the user to be managed
diff --git a/lib/ansible/modules/web_infrastructure/htpasswd.py b/lib/ansible/modules/web_infrastructure/htpasswd.py
index 350a400fb3d..984e1b1e356 100644
--- a/lib/ansible/modules/web_infrastructure/htpasswd.py
+++ b/lib/ansible/modules/web_infrastructure/htpasswd.py
@@ -53,7 +53,7 @@ options:
       - Whether the user entry should be present or not
   create:
     required: false
-    choices: [ "yes", "no" ]
+    type: bool
     default: "yes"
     description:
       - Used with C(state=present). If specified, the file will be created
diff --git a/lib/ansible/utils/module_docs_fragments/fortios.py b/lib/ansible/utils/module_docs_fragments/fortios.py
index 4a371de571f..d53bbc007a6 100644
--- a/lib/ansible/utils/module_docs_fragments/fortios.py
+++ b/lib/ansible/utils/module_docs_fragments/fortios.py
@@ -56,7 +56,7 @@ options:
         changes are made.  The backup file is written to the i(backup)
         folder.
     default: no
-    choices: ['yes', 'no']
+    type: bool
   backup_path:
     description:
       - Specifies where to store backup files. Required if I(backup=yes).
diff --git a/lib/ansible/utils/module_docs_fragments/oneview.py b/lib/ansible/utils/module_docs_fragments/oneview.py
index 88429522b24..73b2eb65486 100644
--- a/lib/ansible/utils/module_docs_fragments/oneview.py
+++ b/lib/ansible/utils/module_docs_fragments/oneview.py
@@ -50,7 +50,7 @@ options:
             - When the ETag Validation is enabled, the request will be conditionally processed only if the current ETag
                 for the resource matches the ETag provided in the data.
         default: true
-        choices: ['true', 'false']
+        type: bool
 '''
 
     FACTSPARAMS = '''
diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt
index 382aac45b0b..23c30d6baed 100644
--- a/test/sanity/validate-modules/ignore.txt
+++ b/test/sanity/validate-modules/ignore.txt
@@ -6,7 +6,6 @@ lib/ansible/modules/cloud/amazon/aws_api_gateway.py E322
 lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py E322
 lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py E324
 lib/ansible/modules/cloud/amazon/aws_application_scaling_policy.py E326
-lib/ansible/modules/cloud/amazon/aws_direct_connect_connection.py E325
 lib/ansible/modules/cloud/amazon/aws_direct_connect_gateway.py E322
 lib/ansible/modules/cloud/amazon/aws_direct_connect_gateway.py E324
 lib/ansible/modules/cloud/amazon/aws_direct_connect_link_aggregation_group.py E325
@@ -43,8 +42,6 @@ lib/ansible/modules/cloud/amazon/ec2_ami.py E324
 lib/ansible/modules/cloud/amazon/ec2_ami.py E325
 lib/ansible/modules/cloud/amazon/ec2_ami.py E326
 lib/ansible/modules/cloud/amazon/ec2_ami_copy.py E325
-lib/ansible/modules/cloud/amazon/ec2_ami_facts.py E325
-lib/ansible/modules/cloud/amazon/ec2_ami_facts.py E326
 lib/ansible/modules/cloud/amazon/ec2_asg.py E324
 lib/ansible/modules/cloud/amazon/ec2_asg.py E325
 lib/ansible/modules/cloud/amazon/ec2_asg.py E326
@@ -61,7 +58,6 @@ lib/ansible/modules/cloud/amazon/ec2_eni.py E324
 lib/ansible/modules/cloud/amazon/ec2_eni.py E325
 lib/ansible/modules/cloud/amazon/ec2_group.py E322
 lib/ansible/modules/cloud/amazon/ec2_group.py E325
-lib/ansible/modules/cloud/amazon/ec2_group.py E326
 lib/ansible/modules/cloud/amazon/ec2_instance.py E324
 lib/ansible/modules/cloud/amazon/ec2_instance.py E325
 lib/ansible/modules/cloud/amazon/ec2_key.py E325
@@ -71,20 +67,15 @@ lib/ansible/modules/cloud/amazon/ec2_lc.py E325
 lib/ansible/modules/cloud/amazon/ec2_lc.py E326
 lib/ansible/modules/cloud/amazon/ec2_metric_alarm.py E324
 lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py E324
-lib/ansible/modules/cloud/amazon/ec2_snapshot.py E325
-lib/ansible/modules/cloud/amazon/ec2_snapshot.py E326
 lib/ansible/modules/cloud/amazon/ec2_vol.py E322
 lib/ansible/modules/cloud/amazon/ec2_vol.py E324
 lib/ansible/modules/cloud/amazon/ec2_vol.py E325
 lib/ansible/modules/cloud/amazon/ec2_vol.py E326
 lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py E322
 lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_option_facts.py E325
-lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py E325
-lib/ansible/modules/cloud/amazon/ec2_vpc_endpoint.py E326
 lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py E324
 lib/ansible/modules/cloud/amazon/ec2_vpc_nat_gateway.py E325
 lib/ansible/modules/cloud/amazon/ec2_vpc_net.py E325
-lib/ansible/modules/cloud/amazon/ec2_vpc_net.py E326
 lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py E325
 lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py E317
 lib/ansible/modules/cloud/amazon/ec2_vpc_vgw.py E322
@@ -96,8 +87,6 @@ lib/ansible/modules/cloud/amazon/ec2_vpc_vpn.py E326
 lib/ansible/modules/cloud/amazon/ecs_cluster.py E324
 lib/ansible/modules/cloud/amazon/ecs_ecr.py E325
 lib/ansible/modules/cloud/amazon/ecs_service_facts.py E324
-lib/ansible/modules/cloud/amazon/ecs_service_facts.py E325
-lib/ansible/modules/cloud/amazon/ecs_service_facts.py E326
 lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py E325
 lib/ansible/modules/cloud/amazon/elasticache.py E324
 lib/ansible/modules/cloud/amazon/elasticache.py E326
@@ -106,11 +95,8 @@ lib/ansible/modules/cloud/amazon/elasticache_subnet_group.py E324
 lib/ansible/modules/cloud/amazon/elb_application_lb.py E322
 lib/ansible/modules/cloud/amazon/elb_application_lb.py E324
 lib/ansible/modules/cloud/amazon/elb_application_lb.py E325
-lib/ansible/modules/cloud/amazon/elb_application_lb.py E326
 lib/ansible/modules/cloud/amazon/elb_classic_lb_facts.py E323
 lib/ansible/modules/cloud/amazon/elb_instance.py E326
-lib/ansible/modules/cloud/amazon/elb_target.py E325
-lib/ansible/modules/cloud/amazon/elb_target.py E326
 lib/ansible/modules/cloud/amazon/elb_target.py E327
 lib/ansible/modules/cloud/amazon/elb_target_group.py E322
 lib/ansible/modules/cloud/amazon/elb_target_group.py E324
@@ -249,15 +235,10 @@ lib/ansible/modules/cloud/azure/azure_rm_virtualmachineimage_facts.py E325
 lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py E322
 lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork.py E324
 lib/ansible/modules/cloud/azure/azure_rm_virtualnetwork_facts.py E324
-lib/ansible/modules/cloud/centurylink/clc_aa_policy.py E326
 lib/ansible/modules/cloud/centurylink/clc_alert_policy.py E317
-lib/ansible/modules/cloud/centurylink/clc_blueprint_package.py E326
 lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py E317
 lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py E324
 lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py E326
-lib/ansible/modules/cloud/centurylink/clc_group.py E325
-lib/ansible/modules/cloud/centurylink/clc_group.py E326
-lib/ansible/modules/cloud/centurylink/clc_server_snapshot.py E326
 lib/ansible/modules/cloud/cloudscale/cloudscale_server.py E325
 lib/ansible/modules/cloud/cloudstack/cs_cluster.py E326
 lib/ansible/modules/cloud/cloudstack/cs_domain.py E325
@@ -302,7 +283,6 @@ lib/ansible/modules/cloud/cloudstack/cs_vpc.py E325
 lib/ansible/modules/cloud/cloudstack/cs_vpc_offering.py E325
 lib/ansible/modules/cloud/cloudstack/cs_vpn_connection.py E322
 lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py E325
-lib/ansible/modules/cloud/cloudstack/cs_vpn_customer_gateway.py E326
 lib/ansible/modules/cloud/cloudstack/cs_zone.py E322
 lib/ansible/modules/cloud/cloudstack/cs_zone.py E325
 lib/ansible/modules/cloud/cloudstack/cs_zone.py E326
@@ -381,21 +361,11 @@ lib/ansible/modules/cloud/misc/terraform.py E324
 lib/ansible/modules/cloud/misc/terraform.py E325
 lib/ansible/modules/cloud/misc/virt.py E322
 lib/ansible/modules/cloud/misc/virt.py E326
-lib/ansible/modules/cloud/misc/virt_net.py E325
-lib/ansible/modules/cloud/misc/virt_net.py E326
-lib/ansible/modules/cloud/misc/virt_pool.py E325
 lib/ansible/modules/cloud/misc/virt_pool.py E326
-lib/ansible/modules/cloud/oneandone/oneandone_firewall_policy.py E325
-lib/ansible/modules/cloud/oneandone/oneandone_firewall_policy.py E326
 lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py E324
 lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py E325
-lib/ansible/modules/cloud/oneandone/oneandone_load_balancer.py E326
-lib/ansible/modules/cloud/oneandone/oneandone_monitoring_policy.py E325
-lib/ansible/modules/cloud/oneandone/oneandone_monitoring_policy.py E326
-lib/ansible/modules/cloud/oneandone/oneandone_private_network.py E325
 lib/ansible/modules/cloud/oneandone/oneandone_private_network.py E326
 lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E324
-lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E325
 lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E326
 lib/ansible/modules/cloud/oneandone/oneandone_server.py E326
 lib/ansible/modules/cloud/openstack/os_flavor_facts.py E324
@@ -534,15 +504,11 @@ lib/ansible/modules/cloud/packet/packet_sshkey.py E322
 lib/ansible/modules/cloud/profitbricks/profitbricks.py E322
 lib/ansible/modules/cloud/profitbricks/profitbricks.py E324
 lib/ansible/modules/cloud/profitbricks/profitbricks.py E326
-lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py E325
 lib/ansible/modules/cloud/profitbricks/profitbricks_datacenter.py E326
 lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py E324
-lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py E325
 lib/ansible/modules/cloud/profitbricks/profitbricks_nic.py E326
 lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py E322
-lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py E325
 lib/ansible/modules/cloud/profitbricks/profitbricks_volume.py E326
-lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py E325
 lib/ansible/modules/cloud/profitbricks/profitbricks_volume_attachments.py E326
 lib/ansible/modules/cloud/pubnub/pubnub_blocks.py E324
 lib/ansible/modules/cloud/pubnub/pubnub_blocks.py E325
@@ -565,7 +531,6 @@ lib/ansible/modules/cloud/rackspace/rax_clb.py E325
 lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py E322
 lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py E324
 lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py E325
-lib/ansible/modules/cloud/rackspace/rax_clb_nodes.py E326
 lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py E324
 lib/ansible/modules/cloud/rackspace/rax_clb_ssl.py E325
 lib/ansible/modules/cloud/rackspace/rax_dns.py E324
@@ -589,7 +554,6 @@ lib/ansible/modules/cloud/rackspace/rax_meta.py E324
 lib/ansible/modules/cloud/rackspace/rax_meta.py E325
 lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py E324
 lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py E325
-lib/ansible/modules/cloud/rackspace/rax_mon_alarm.py E326
 lib/ansible/modules/cloud/rackspace/rax_mon_check.py E324
 lib/ansible/modules/cloud/rackspace/rax_mon_check.py E325
 lib/ansible/modules/cloud/rackspace/rax_mon_check.py E326
@@ -608,8 +572,6 @@ lib/ansible/modules/cloud/rackspace/rax_scaling_group.py E325
 lib/ansible/modules/cloud/rackspace/rax_scaling_policy.py E324
 lib/ansible/modules/cloud/rackspace/rax_scaling_policy.py E325
 lib/ansible/modules/cloud/smartos/imgadm.py E317
-lib/ansible/modules/cloud/smartos/imgadm.py E325
-lib/ansible/modules/cloud/smartos/imgadm.py E326
 lib/ansible/modules/cloud/smartos/vmadm.py E322
 lib/ansible/modules/cloud/smartos/vmadm.py E324
 lib/ansible/modules/cloud/smartos/vmadm.py E325
@@ -655,7 +617,6 @@ lib/ansible/modules/cloud/vultr/vr_ssh_key.py E324
 lib/ansible/modules/cloud/vultr/vr_startup_script.py E324
 lib/ansible/modules/cloud/vultr/vr_user.py E322
 lib/ansible/modules/cloud/vultr/vr_user.py E324
-lib/ansible/modules/cloud/vultr/vr_user.py E325
 lib/ansible/modules/cloud/vultr/vr_user.py E326
 lib/ansible/modules/clustering/consul.py E322
 lib/ansible/modules/clustering/consul.py E324
@@ -676,13 +637,6 @@ lib/ansible/modules/commands/command.py E325
 lib/ansible/modules/commands/expect.py E325
 lib/ansible/modules/crypto/openssl_certificate.py E325
 lib/ansible/modules/crypto/openssl_csr.py E325
-lib/ansible/modules/crypto/openssl_csr.py E326
-lib/ansible/modules/crypto/openssl_dhparam.py E325
-lib/ansible/modules/crypto/openssl_dhparam.py E326
-lib/ansible/modules/crypto/openssl_privatekey.py E325
-lib/ansible/modules/crypto/openssl_privatekey.py E326
-lib/ansible/modules/crypto/openssl_publickey.py E325
-lib/ansible/modules/crypto/openssl_publickey.py E326
 lib/ansible/modules/database/influxdb/influxdb_database.py E324
 lib/ansible/modules/database/influxdb/influxdb_database.py E325
 lib/ansible/modules/database/influxdb/influxdb_query.py E324
@@ -691,7 +645,6 @@ lib/ansible/modules/database/influxdb/influxdb_retention_policy.py E324
 lib/ansible/modules/database/influxdb/influxdb_retention_policy.py E325
 lib/ansible/modules/database/influxdb/influxdb_user.py E324
 lib/ansible/modules/database/influxdb/influxdb_user.py E325
-lib/ansible/modules/database/influxdb/influxdb_user.py E326
 lib/ansible/modules/database/influxdb/influxdb_write.py E324
 lib/ansible/modules/database/influxdb/influxdb_write.py E325
 lib/ansible/modules/database/misc/riak.py E324
@@ -707,7 +660,6 @@ lib/ansible/modules/database/mysql/mysql_user.py E322
 lib/ansible/modules/database/postgresql/postgresql_ext.py E322
 lib/ansible/modules/database/postgresql/postgresql_ext.py E324
 lib/ansible/modules/database/postgresql/postgresql_lang.py E324
-lib/ansible/modules/database/postgresql/postgresql_lang.py E326
 lib/ansible/modules/database/postgresql/postgresql_privs.py E322
 lib/ansible/modules/database/postgresql/postgresql_schema.py E322
 lib/ansible/modules/database/postgresql/postgresql_schema.py E324
@@ -747,8 +699,6 @@ lib/ansible/modules/files/lineinfile.py E322
 lib/ansible/modules/files/lineinfile.py E323
 lib/ansible/modules/files/lineinfile.py E324
 lib/ansible/modules/files/lineinfile.py E326
-lib/ansible/modules/files/patch.py E325
-lib/ansible/modules/files/patch.py E326
 lib/ansible/modules/files/replace.py E323
 lib/ansible/modules/files/synchronize.py E322
 lib/ansible/modules/files/synchronize.py E323
@@ -787,19 +737,14 @@ lib/ansible/modules/identity/keycloak/keycloak_clienttemplate.py E324
 lib/ansible/modules/identity/keycloak/keycloak_clienttemplate.py E325
 lib/ansible/modules/messaging/rabbitmq_binding.py E324
 lib/ansible/modules/messaging/rabbitmq_exchange.py E324
-lib/ansible/modules/messaging/rabbitmq_exchange.py E325
 lib/ansible/modules/messaging/rabbitmq_exchange.py E326
 lib/ansible/modules/messaging/rabbitmq_policy.py E324
 lib/ansible/modules/messaging/rabbitmq_queue.py E324
 lib/ansible/modules/messaging/rabbitmq_queue.py E327
 lib/ansible/modules/messaging/rabbitmq_user.py E324
 lib/ansible/modules/monitoring/airbrake_deployment.py E324
-lib/ansible/modules/monitoring/airbrake_deployment.py E325
-lib/ansible/modules/monitoring/airbrake_deployment.py E326
 lib/ansible/modules/monitoring/bigpanda.py E322
 lib/ansible/modules/monitoring/bigpanda.py E324
-lib/ansible/modules/monitoring/bigpanda.py E325
-lib/ansible/modules/monitoring/bigpanda.py E326
 lib/ansible/modules/monitoring/circonus_annotation.py E327
 lib/ansible/modules/monitoring/datadog_event.py E324
 lib/ansible/modules/monitoring/datadog_event.py E327
@@ -818,19 +763,11 @@ lib/ansible/modules/monitoring/logicmonitor_facts.py E317
 lib/ansible/modules/monitoring/logicmonitor_facts.py E324
 lib/ansible/modules/monitoring/nagios.py E317
 lib/ansible/modules/monitoring/nagios.py E324
-lib/ansible/modules/monitoring/newrelic_deployment.py E325
-lib/ansible/modules/monitoring/newrelic_deployment.py E326
 lib/ansible/modules/monitoring/pagerduty.py E324
 lib/ansible/modules/monitoring/pingdom.py E326
-lib/ansible/modules/monitoring/rollbar_deployment.py E325
-lib/ansible/modules/monitoring/rollbar_deployment.py E326
 lib/ansible/modules/monitoring/sensu_check.py E324
 lib/ansible/modules/monitoring/sensu_client.py E324
 lib/ansible/modules/monitoring/sensu_handler.py E326
-lib/ansible/modules/monitoring/sensu_subscription.py E325
-lib/ansible/modules/monitoring/sensu_subscription.py E326
-lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py E325
-lib/ansible/modules/monitoring/zabbix/zabbix_hostmacro.py E326
 lib/ansible/modules/monitoring/zabbix/zabbix_maintenance.py E317
 lib/ansible/modules/net_tools/basics/get_url.py E322
 lib/ansible/modules/net_tools/basics/get_url.py E323
@@ -1000,15 +937,8 @@ lib/ansible/modules/network/aci/aci_vrf.py E324
 lib/ansible/modules/network/aci/aci_vrf.py E326
 lib/ansible/modules/network/aci/aci_vrf.py E327
 lib/ansible/modules/network/aos/_aos_blueprint_param.py E325
-lib/ansible/modules/network/aos/_aos_device.py E325
-lib/ansible/modules/network/aos/_aos_device.py E326
 lib/ansible/modules/network/asa/asa_config.py E324
-lib/ansible/modules/network/bigswitch/bcf_switch.py E325
-lib/ansible/modules/network/bigswitch/bcf_switch.py E326
-lib/ansible/modules/network/bigswitch/bigmon_chain.py E325
-lib/ansible/modules/network/bigswitch/bigmon_chain.py E326
 lib/ansible/modules/network/bigswitch/bigmon_policy.py E324
-lib/ansible/modules/network/bigswitch/bigmon_policy.py E325
 lib/ansible/modules/network/bigswitch/bigmon_policy.py E326
 lib/ansible/modules/network/citrix/_netscaler.py E324
 lib/ansible/modules/network/cloudengine/ce_aaa_server.py E322
@@ -1130,14 +1060,8 @@ lib/ansible/modules/network/eos/eos_logging.py E326
 lib/ansible/modules/network/eos/eos_vlan.py E325
 lib/ansible/modules/network/eos/eos_vrf.py E325
 lib/ansible/modules/network/f5/bigip_asm_policy.py E324
-lib/ansible/modules/network/f5/bigip_asm_policy.py E325
-lib/ansible/modules/network/f5/bigip_asm_policy.py E326
 lib/ansible/modules/network/f5/bigip_command.py E326
 lib/ansible/modules/network/f5/bigip_config.py E324
-lib/ansible/modules/network/f5/bigip_configsync_action.py E325
-lib/ansible/modules/network/f5/bigip_configsync_action.py E326
-lib/ansible/modules/network/f5/bigip_device_connectivity.py E325
-lib/ansible/modules/network/f5/bigip_device_connectivity.py E326
 lib/ansible/modules/network/f5/bigip_device_dns.py E324
 lib/ansible/modules/network/f5/bigip_device_dns.py E326
 lib/ansible/modules/network/f5/bigip_device_group.py E324
@@ -1156,8 +1080,6 @@ lib/ansible/modules/network/f5/bigip_iapp_service.py E325
 lib/ansible/modules/network/f5/bigip_monitor_snmp_dca.py E326
 lib/ansible/modules/network/f5/bigip_policy.py E324
 lib/ansible/modules/network/f5/bigip_pool.py E326
-lib/ansible/modules/network/f5/bigip_pool_member.py E325
-lib/ansible/modules/network/f5/bigip_pool_member.py E326
 lib/ansible/modules/network/f5/bigip_profile_client_ssl.py E324
 lib/ansible/modules/network/f5/bigip_provision.py E326
 lib/ansible/modules/network/f5/bigip_qkview.py E324
@@ -1169,32 +1091,18 @@ lib/ansible/modules/network/f5/bigip_virtual_server.py E326
 lib/ansible/modules/network/f5/bigiq_regkey_license.py E325
 lib/ansible/modules/network/fortimanager/fmgr_script.py E324
 lib/ansible/modules/network/fortios/fortios_address.py E324
-lib/ansible/modules/network/fortios/fortios_address.py E325
-lib/ansible/modules/network/fortios/fortios_address.py E326
-lib/ansible/modules/network/fortios/fortios_config.py E325
-lib/ansible/modules/network/fortios/fortios_config.py E326
-lib/ansible/modules/network/fortios/fortios_ipv4_policy.py E325
-lib/ansible/modules/network/fortios/fortios_ipv4_policy.py E326
-lib/ansible/modules/network/illumos/dladm_etherstub.py E325
-lib/ansible/modules/network/illumos/dladm_etherstub.py E326
 lib/ansible/modules/network/illumos/dladm_iptun.py E325
 lib/ansible/modules/network/illumos/dladm_linkprop.py E317
 lib/ansible/modules/network/illumos/dladm_vlan.py E324
 lib/ansible/modules/network/illumos/dladm_vlan.py E325
 lib/ansible/modules/network/illumos/dladm_vnic.py E324
-lib/ansible/modules/network/illumos/dladm_vnic.py E325
-lib/ansible/modules/network/illumos/dladm_vnic.py E326
-lib/ansible/modules/network/illumos/flowadm.py E325
 lib/ansible/modules/network/illumos/flowadm.py E326
 lib/ansible/modules/network/illumos/ipadm_addr.py E325
 lib/ansible/modules/network/illumos/ipadm_addrprop.py E317
 lib/ansible/modules/network/illumos/ipadm_addrprop.py E325
-lib/ansible/modules/network/illumos/ipadm_if.py E325
-lib/ansible/modules/network/illumos/ipadm_if.py E326
 lib/ansible/modules/network/illumos/ipadm_ifprop.py E317
 lib/ansible/modules/network/illumos/ipadm_ifprop.py E325
 lib/ansible/modules/network/illumos/ipadm_ifprop.py E326
-lib/ansible/modules/network/illumos/ipadm_prop.py E325
 lib/ansible/modules/network/illumos/ipadm_prop.py E326
 lib/ansible/modules/network/ios/ios_interface.py E324
 lib/ansible/modules/network/ios/ios_interface.py E325
@@ -1217,32 +1125,12 @@ lib/ansible/modules/network/junos/junos_config.py E325
 lib/ansible/modules/network/junos/junos_config.py E326
 lib/ansible/modules/network/junos/junos_interface.py E324
 lib/ansible/modules/network/junos/junos_interface.py E325
-lib/ansible/modules/network/junos/junos_interface.py E326
-lib/ansible/modules/network/junos/junos_l2_interface.py E325
-lib/ansible/modules/network/junos/junos_l2_interface.py E326
-lib/ansible/modules/network/junos/junos_l3_interface.py E325
-lib/ansible/modules/network/junos/junos_l3_interface.py E326
 lib/ansible/modules/network/junos/junos_linkagg.py E324
-lib/ansible/modules/network/junos/junos_linkagg.py E325
-lib/ansible/modules/network/junos/junos_linkagg.py E326
-lib/ansible/modules/network/junos/junos_lldp.py E325
-lib/ansible/modules/network/junos/junos_lldp.py E326
-lib/ansible/modules/network/junos/junos_lldp_interface.py E325
-lib/ansible/modules/network/junos/junos_lldp_interface.py E326
 lib/ansible/modules/network/junos/junos_logging.py E322
-lib/ansible/modules/network/junos/junos_logging.py E325
-lib/ansible/modules/network/junos/junos_logging.py E326
 lib/ansible/modules/network/junos/junos_rpc.py E326
 lib/ansible/modules/network/junos/junos_static_route.py E322
 lib/ansible/modules/network/junos/junos_static_route.py E325
-lib/ansible/modules/network/junos/junos_static_route.py E326
-lib/ansible/modules/network/junos/junos_system.py E325
-lib/ansible/modules/network/junos/junos_system.py E326
-lib/ansible/modules/network/junos/junos_vlan.py E325
-lib/ansible/modules/network/junos/junos_vlan.py E326
 lib/ansible/modules/network/junos/junos_vrf.py E324
-lib/ansible/modules/network/junos/junos_vrf.py E325
-lib/ansible/modules/network/junos/junos_vrf.py E326
 lib/ansible/modules/network/netact/netact_cm_command.py E326
 lib/ansible/modules/network/netconf/netconf_config.py E325
 lib/ansible/modules/network/netconf/netconf_config.py E326
@@ -1302,8 +1190,6 @@ lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py E325
 lib/ansible/modules/network/nxos/nxos_bgp_neighbor_af.py E326
 lib/ansible/modules/network/nxos/nxos_command.py E326
 lib/ansible/modules/network/nxos/nxos_config.py E324
-lib/ansible/modules/network/nxos/nxos_evpn_global.py E325
-lib/ansible/modules/network/nxos/nxos_evpn_global.py E326
 lib/ansible/modules/network/nxos/nxos_file_copy.py E324
 lib/ansible/modules/network/nxos/nxos_gir.py E326
 lib/ansible/modules/network/nxos/nxos_igmp_interface.py E326
@@ -1311,7 +1197,6 @@ lib/ansible/modules/network/nxos/nxos_interface.py E324
 lib/ansible/modules/network/nxos/nxos_lldp.py E326
 lib/ansible/modules/network/nxos/nxos_logging.py E325
 lib/ansible/modules/network/nxos/nxos_nxapi.py E324
-lib/ansible/modules/network/nxos/nxos_nxapi.py E325
 lib/ansible/modules/network/nxos/nxos_nxapi.py E326
 lib/ansible/modules/network/nxos/nxos_pim_interface.py E326
 lib/ansible/modules/network/nxos/nxos_pim_rp_address.py E326
@@ -1324,8 +1209,6 @@ lib/ansible/modules/network/nxos/nxos_vpc_interface.py E325
 lib/ansible/modules/network/nxos/nxos_vrrp.py E324
 lib/ansible/modules/network/onyx/onyx_command.py E323
 lib/ansible/modules/network/onyx/onyx_config.py E323
-lib/ansible/modules/network/onyx/onyx_config.py E325
-lib/ansible/modules/network/onyx/onyx_config.py E326
 lib/ansible/modules/network/onyx/onyx_interface.py E323
 lib/ansible/modules/network/onyx/onyx_l3_interface.py E326
 lib/ansible/modules/network/onyx/onyx_linkagg.py E324
@@ -1373,14 +1256,8 @@ lib/ansible/modules/network/vyos/vyos_linkagg.py E324
 lib/ansible/modules/network/vyos/vyos_lldp.py E322
 lib/ansible/modules/network/vyos/vyos_lldp.py E326
 lib/ansible/modules/network/vyos/vyos_vlan.py E325
-lib/ansible/modules/notification/bearychat.py E325
-lib/ansible/modules/notification/bearychat.py E326
 lib/ansible/modules/notification/cisco_spark.py E322
 lib/ansible/modules/notification/cisco_spark.py E324
-lib/ansible/modules/notification/flowdock.py E325
-lib/ansible/modules/notification/flowdock.py E326
-lib/ansible/modules/notification/grove.py E325
-lib/ansible/modules/notification/grove.py E326
 lib/ansible/modules/notification/hall.py E324
 lib/ansible/modules/notification/hipchat.py E322
 lib/ansible/modules/notification/hipchat.py E324
@@ -1389,10 +1266,7 @@ lib/ansible/modules/notification/irc.py E324
 lib/ansible/modules/notification/irc.py E326
 lib/ansible/modules/notification/mail.py E322
 lib/ansible/modules/notification/mail.py E324
-lib/ansible/modules/notification/mattermost.py E325
-lib/ansible/modules/notification/mattermost.py E326
 lib/ansible/modules/notification/mqtt.py E324
-lib/ansible/modules/notification/nexmo.py E326
 lib/ansible/modules/notification/pushbullet.py E322
 lib/ansible/modules/notification/pushover.py E324
 lib/ansible/modules/notification/pushover.py E326
@@ -1401,15 +1275,10 @@ lib/ansible/modules/notification/sendgrid.py E322
 lib/ansible/modules/notification/slack.py E324
 lib/ansible/modules/notification/snow_record.py E317
 lib/ansible/modules/packaging/language/bundler.py E324
-lib/ansible/modules/packaging/language/composer.py E325
-lib/ansible/modules/packaging/language/composer.py E326
 lib/ansible/modules/packaging/language/cpanm.py E324
 lib/ansible/modules/packaging/language/easy_install.py E324
 lib/ansible/modules/packaging/language/gem.py E325
-lib/ansible/modules/packaging/language/gem.py E326
 lib/ansible/modules/packaging/language/maven_artifact.py E324
-lib/ansible/modules/packaging/language/npm.py E325
-lib/ansible/modules/packaging/language/npm.py E326
 lib/ansible/modules/packaging/language/pear.py E322
 lib/ansible/modules/packaging/language/pear.py E326
 lib/ansible/modules/packaging/language/pip.py E322
@@ -1433,12 +1302,10 @@ lib/ansible/modules/packaging/os/homebrew.py E326
 lib/ansible/modules/packaging/os/homebrew_cask.py E326
 lib/ansible/modules/packaging/os/layman.py E322
 lib/ansible/modules/packaging/os/macports.py E322
-lib/ansible/modules/packaging/os/macports.py E325
 lib/ansible/modules/packaging/os/macports.py E326
 lib/ansible/modules/packaging/os/openbsd_pkg.py E326
 lib/ansible/modules/packaging/os/opkg.py E322
 lib/ansible/modules/packaging/os/opkg.py E324
-lib/ansible/modules/packaging/os/opkg.py E325
 lib/ansible/modules/packaging/os/opkg.py E326
 lib/ansible/modules/packaging/os/package_facts.py E324
 lib/ansible/modules/packaging/os/package_facts.py E326
@@ -1446,14 +1313,10 @@ lib/ansible/modules/packaging/os/pacman.py E326
 lib/ansible/modules/packaging/os/pkg5.py E326
 lib/ansible/modules/packaging/os/pkgin.py E322
 lib/ansible/modules/packaging/os/pkgng.py E322
-lib/ansible/modules/packaging/os/pkgng.py E325
-lib/ansible/modules/packaging/os/pkgng.py E326
 lib/ansible/modules/packaging/os/pkgutil.py E325
 lib/ansible/modules/packaging/os/portage.py E322
 lib/ansible/modules/packaging/os/portage.py E325
 lib/ansible/modules/packaging/os/portinstall.py E322
-lib/ansible/modules/packaging/os/portinstall.py E325
-lib/ansible/modules/packaging/os/portinstall.py E326
 lib/ansible/modules/packaging/os/pulp_repo.py E322
 lib/ansible/modules/packaging/os/pulp_repo.py E324
 lib/ansible/modules/packaging/os/rhn_channel.py E322
@@ -1462,10 +1325,7 @@ lib/ansible/modules/packaging/os/rhn_register.py E324
 lib/ansible/modules/packaging/os/rhsm_repository.py E324
 lib/ansible/modules/packaging/os/slackpkg.py E322
 lib/ansible/modules/packaging/os/slackpkg.py E324
-lib/ansible/modules/packaging/os/slackpkg.py E325
 lib/ansible/modules/packaging/os/slackpkg.py E326
-lib/ansible/modules/packaging/os/svr4pkg.py E325
-lib/ansible/modules/packaging/os/svr4pkg.py E326
 lib/ansible/modules/packaging/os/swdepot.py E322
 lib/ansible/modules/packaging/os/swupd.py E325
 lib/ansible/modules/packaging/os/urpmi.py E322
@@ -1478,17 +1338,14 @@ lib/ansible/modules/packaging/os/xbps.py E326
 lib/ansible/modules/packaging/os/yum.py E322
 lib/ansible/modules/packaging/os/yum.py E324
 lib/ansible/modules/packaging/os/yum.py E325
-lib/ansible/modules/packaging/os/yum.py E326
 lib/ansible/modules/packaging/os/yum_repository.py E322
 lib/ansible/modules/packaging/os/yum_repository.py E324
-lib/ansible/modules/packaging/os/zypper.py E325
 lib/ansible/modules/packaging/os/zypper.py E326
 lib/ansible/modules/remote_management/foreman/foreman.py E322
 lib/ansible/modules/remote_management/foreman/foreman.py E325
 lib/ansible/modules/remote_management/foreman/katello.py E322
 lib/ansible/modules/remote_management/foreman/katello.py E325
 lib/ansible/modules/remote_management/hpilo/hpilo_boot.py E324
-lib/ansible/modules/remote_management/hpilo/hpilo_boot.py E325
 lib/ansible/modules/remote_management/hpilo/hpilo_boot.py E326
 lib/ansible/modules/remote_management/ipmi/ipmi_boot.py E326
 lib/ansible/modules/remote_management/ipmi/ipmi_power.py E326
@@ -1502,28 +1359,16 @@ lib/ansible/modules/remote_management/manageiq/manageiq_user.py E324
 lib/ansible/modules/remote_management/oneview/oneview_datacenter_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_enclosure_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_ethernet_network.py E322
-lib/ansible/modules/remote_management/oneview/oneview_ethernet_network.py E325
-lib/ansible/modules/remote_management/oneview/oneview_ethernet_network.py E326
 lib/ansible/modules/remote_management/oneview/oneview_ethernet_network_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_fc_network.py E322
-lib/ansible/modules/remote_management/oneview/oneview_fc_network.py E325
-lib/ansible/modules/remote_management/oneview/oneview_fc_network.py E326
 lib/ansible/modules/remote_management/oneview/oneview_fc_network_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_fcoe_network.py E322
-lib/ansible/modules/remote_management/oneview/oneview_fcoe_network.py E325
-lib/ansible/modules/remote_management/oneview/oneview_fcoe_network.py E326
 lib/ansible/modules/remote_management/oneview/oneview_fcoe_network_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_logical_interconnect_group.py E322
-lib/ansible/modules/remote_management/oneview/oneview_logical_interconnect_group.py E325
-lib/ansible/modules/remote_management/oneview/oneview_logical_interconnect_group.py E326
 lib/ansible/modules/remote_management/oneview/oneview_logical_interconnect_group_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_network_set.py E322
-lib/ansible/modules/remote_management/oneview/oneview_network_set.py E325
-lib/ansible/modules/remote_management/oneview/oneview_network_set.py E326
 lib/ansible/modules/remote_management/oneview/oneview_network_set_facts.py E322
 lib/ansible/modules/remote_management/oneview/oneview_san_manager.py E322
-lib/ansible/modules/remote_management/oneview/oneview_san_manager.py E325
-lib/ansible/modules/remote_management/oneview/oneview_san_manager.py E326
 lib/ansible/modules/remote_management/oneview/oneview_san_manager_facts.py E322
 lib/ansible/modules/remote_management/stacki/stacki_host.py E317
 lib/ansible/modules/remote_management/stacki/stacki_host.py E322
@@ -1540,8 +1385,6 @@ lib/ansible/modules/remote_management/ucs/ucs_vnic_template.py E326
 lib/ansible/modules/remote_management/ucs/ucs_vsans.py E322
 lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py E322
 lib/ansible/modules/remote_management/ucs/ucs_wwn_pool.py E323
-lib/ansible/modules/source_control/github_hooks.py E325
-lib/ansible/modules/source_control/github_hooks.py E326
 lib/ansible/modules/source_control/github_issue.py E324
 lib/ansible/modules/source_control/github_issue.py E326
 lib/ansible/modules/source_control/gitlab_group.py E325
@@ -1552,10 +1395,6 @@ lib/ansible/modules/source_control/subversion.py E322
 lib/ansible/modules/storage/infinidat/infini_export.py E323
 lib/ansible/modules/storage/infinidat/infini_export.py E324
 lib/ansible/modules/storage/infinidat/infini_export_client.py E323
-lib/ansible/modules/storage/infinidat/infini_export_client.py E325
-lib/ansible/modules/storage/infinidat/infini_export_client.py E326
-lib/ansible/modules/storage/infinidat/infini_pool.py E325
-lib/ansible/modules/storage/infinidat/infini_pool.py E326
 lib/ansible/modules/storage/netapp/na_cdot_license.py E329
 lib/ansible/modules/storage/netapp/na_cdot_lun.py E325
 lib/ansible/modules/storage/netapp/na_cdot_volume.py E317
@@ -1566,9 +1405,7 @@ lib/ansible/modules/storage/netapp/netapp_e_amg.py E322
 lib/ansible/modules/storage/netapp/netapp_e_amg.py E325
 lib/ansible/modules/storage/netapp/netapp_e_amg_role.py E322
 lib/ansible/modules/storage/netapp/netapp_e_amg_role.py E325
-lib/ansible/modules/storage/netapp/netapp_e_amg_role.py E326
 lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py E325
-lib/ansible/modules/storage/netapp/netapp_e_amg_sync.py E326
 lib/ansible/modules/storage/netapp/netapp_e_auth.py E325
 lib/ansible/modules/storage/netapp/netapp_e_facts.py E325
 lib/ansible/modules/storage/netapp/netapp_e_flashcache.py E322
@@ -1619,8 +1456,6 @@ lib/ansible/modules/system/authorized_key.py E322
 lib/ansible/modules/system/authorized_key.py E324
 lib/ansible/modules/system/authorized_key.py E325
 lib/ansible/modules/system/beadm.py E324
-lib/ansible/modules/system/beadm.py E325
-lib/ansible/modules/system/beadm.py E326
 lib/ansible/modules/system/capabilities.py E322
 lib/ansible/modules/system/cron.py E324
 lib/ansible/modules/system/cronvar.py E324
@@ -1640,20 +1475,10 @@ lib/ansible/modules/system/java_cert.py E325
 lib/ansible/modules/system/known_hosts.py E324
 lib/ansible/modules/system/lvol.py E324
 lib/ansible/modules/system/make.py E317
-lib/ansible/modules/system/mksysb.py E325
-lib/ansible/modules/system/mksysb.py E326
 lib/ansible/modules/system/mount.py E324
-lib/ansible/modules/system/mount.py E325
-lib/ansible/modules/system/mount.py E326
-lib/ansible/modules/system/nosh.py E325
-lib/ansible/modules/system/nosh.py E326
 lib/ansible/modules/system/open_iscsi.py E322
-lib/ansible/modules/system/open_iscsi.py E325
-lib/ansible/modules/system/open_iscsi.py E326
 lib/ansible/modules/system/osx_defaults.py E322
 lib/ansible/modules/system/osx_defaults.py E324
-lib/ansible/modules/system/pam_limits.py E325
-lib/ansible/modules/system/pam_limits.py E326
 lib/ansible/modules/system/pamd.py E324
 lib/ansible/modules/system/pamd.py E326
 lib/ansible/modules/system/parted.py E326
@@ -1685,16 +1510,11 @@ lib/ansible/modules/web_infrastructure/ansible_tower/tower_job_template.py E325
 lib/ansible/modules/web_infrastructure/ansible_tower/tower_team.py E322
 lib/ansible/modules/web_infrastructure/apache2_mod_proxy.py E317
 lib/ansible/modules/web_infrastructure/apache2_mod_proxy.py E326
-lib/ansible/modules/web_infrastructure/apache2_module.py E325
-lib/ansible/modules/web_infrastructure/apache2_module.py E326
 lib/ansible/modules/web_infrastructure/django_manage.py E317
 lib/ansible/modules/web_infrastructure/django_manage.py E322
 lib/ansible/modules/web_infrastructure/django_manage.py E325
 lib/ansible/modules/web_infrastructure/django_manage.py E326
-lib/ansible/modules/web_infrastructure/ejabberd_user.py E325
-lib/ansible/modules/web_infrastructure/ejabberd_user.py E326
 lib/ansible/modules/web_infrastructure/gunicorn.py E322
-lib/ansible/modules/web_infrastructure/htpasswd.py E325
 lib/ansible/modules/web_infrastructure/htpasswd.py E326
 lib/ansible/modules/web_infrastructure/jenkins_job.py E325
 lib/ansible/modules/web_infrastructure/jenkins_plugin.py E322