diff -Nru ansible-2.4.1.0/CHANGELOG.md ansible-2.4.2.0/CHANGELOG.md
--- ansible-2.4.1.0/CHANGELOG.md	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/CHANGELOG.md	2017-11-29 21:10:31.000000000 +0000
@@ -1,9 +1,204 @@
 Ansible Changes By Release
 ==========================
 
+<a id="2.4.2"></a>
+
+## 2.4.2 "Dancing Days" - 2017-11-29
+
+### Bugfixes
+
+* Fix formatting typo in panos_security_rule.py docs. (https://github.com/ansible/ansible/commit/c0fc797a06451d2fe1ac4fc077fc64f3a1666447)
+* Fix rpm spec file to build on RHEL6 without EPEL packages (https://github.com/ansible/ansible/pull/31653)
+* Keep hosts in play vars if inside of a rescue task (https://github.com/ansible/ansible/pull/31710)
+* Fix wait_for module to treat broken connections as unready so that the connection continues to be retried:
+  https://github.com/ansible/ansible/pull/28839
+* Python3 fixes:
+  * windows_azure, clc_firewall_policy, and ce_template modules fixed for
+    imports of urllib which changed between Python2 and Python3 lookup plugin
+    for consul_kv.py fixed for imports of urllib
+    (https://github.com/ansible/ansible/issues/31240)
+  * Make internal hashing of hostvars use bytes on both python2 and python3
+    (https://github.com/ansible/ansible/pull/31788)
+* Fix logging inside of KubernetesAnsibleModule() to not use
+  self.helper.logging.  the Ansible builtin log() method will strip out
+  parameters marked no_log and will not log if no_log was set in the playbook.
+  self.helper.log() circumvents that (https://github.com/ansible/ansible/pull/31789)
+* Correct task results display so that it more closely matches what was present
+  in 2.3.x and previous.
+* Warn when a group has a bad key (Should be one of vars, children, or hosts)
+  https://github.com/ansible/ansible/pull/31495
+* Use controller configured ansible_shell_executable to run commands in the module
+  (https://github.com/ansible/ansible/pull/31361)
+* Add documentation about writing unittests for Ansible
+* Fix bugs in get_url/uri's SNI and TLS version handling when used on systems
+  that have Python-2.7.9+ and urllib3 installed.
+* Have ansible-pull process inventory in its own way.  Fixes issues with
+  ansible-pull not using the correct inventory,  especially for localhost
+  (https://github.com/ansible/ansible/pull/32135)
+* Fix for implicit localhost receiving too many variables from the all group
+  (https://github.com/ansible/ansible/pull/31959)
+* Fix the service module to correctly detect which type of init system is
+  present on the host. (https://github.com/ansible/ansible/pull/32086)
+* Fix inventory patterns to convert to strings before processing:
+  (https://github.com/ansible/ansible/issues/31978)
+* Fix traceback in firewalld module instead of a nice error message:
+  (https://github.com/ansible/ansible/pull/31949)
+* Fix for entering privileged mode using eos network modules:
+  (https://github.com/ansible/ansible/issues/30802)
+* Validate that the destination for ansible-pull is a valid.directory:
+  (https://github.com/ansible/ansible/pull/31499)
+* Document how to preserve strings of digits as strings in the ini inventory:
+  (https://github.com/ansible/ansible/pull/32047)
+* Make sure we return ansible_distribution_major_version to macOS:
+  (https://github.com/ansible/ansible/pull/31708)
+* Fix to ansible-doc -l to list custom inventory plugins:
+  (https://github.com/ansible/ansible/pull/31996)
+* Fix win_chocolatey to respect case sensitivity in URLs:
+  (https://github.com/ansible/ansible/pull/31983)
+* Fix config_format json in the junos_facts module:
+  (https://github.com/ansible/ansible/pull/31818)
+* Allow the apt module's autoremove parameter to take effect in upgrades:
+  (https://github.com/ansible/ansible/pull/30747)
+* When creating a new use via eos_user, create the user before setting the
+  user's privilege level: (https://github.com/ansible/ansible/pull/32162)
+* Fixes nxos_portchannel idempotence failure on N1 images:
+  (https://github.com/ansible/ansible/pull/31057)
+* Remove provider from prepare_ios_tests integration test:
+  (https://github.com/ansible/ansible/pull/31038)
+* Fix nxos_acl change ports to non well known ports and drop time_range for N1:
+  (https://github.com/ansible/ansible/pull/31261)
+* Fix nxos_banner removal idempotence issue in N1 images:
+  (https://github.com/ansible/ansible/pull/31259)
+* Return error message back to the module
+  (https://github.com/ansible/ansible/pull/31035)
+* Fix nxos_igmp_snooping idempotence:
+  (https://github.com/ansible/ansible/pull/31688)
+* NXOS integration test nxos_file_copy, nxos_igmp, nxos_igmp_interface
+  nxos_igmp_snooping, nxos_ntp_auth, nxos_ntp_options:
+  (https://github.com/ansible/ansible/pull/29030)
+* Fix elb_target_group module traceback when ports were specified inside of the targets parameter:
+  (https://github.com/ansible/ansible/pull/32202)
+* Fix creation of empty virtual directories in aws_s3 module:
+  (https://github.com/ansible/ansible/pull/32169)
+* Enable echo for `pause` module: (https://github.com/ansible/ansible/issues/14160)
+* Fix for `hashi_vault` lookup to return all keys at a given path when no key is specified (https://github.com/ansible/ansible/pull/32182)
+* Fix for `win_package` to allow TLS 1.1 and 1.2 on web requests:
+  (https://github.com/ansible/ansible/pull/32184)
+* Remove provider from ios integration test:
+  (https://github.com/ansible/ansible/pull/31037)
+* Fix eos_user tests
+  (https://github.com/ansible/ansible/pull/32261)
+* Fix ansible-galaxy --force with installed roles:
+  (https://github.com/ansible/ansible/pull/32282)
+* ios_interface testfix:
+  (https://github.com/ansible/ansible/pull/32335)
+* Fix ios integration tests:
+  (https://github.com/ansible/ansible/pull/32342)
+* Ensure there is always a basdir so we always pickup group/host_vars
+  https://github.com/ansible/ansible/pull/32269
+* Fix vars placement in ansible-inventory
+  https://github.com/ansible/ansible/pull/32276
+* Correct options for luseradd in user module
+  https://github.com/ansible/ansible/pull/32262
+* Clarified package docs on 'latest' state
+  https://github.com/ansible/ansible/pull/32397
+* Fix issue with user module when local is true
+  (https://github.com/ansible/ansible/pull/32262 and https://github.com/ansible/ansible/pull/32411)
+* Fix for max_fail_percentage being inaccurate:
+  (https://github.com/ansible/ansible/issues/32255)
+* Fix check mode when deleting ACS instance in azure_rm_acs module:
+  (https://github.com/ansible/ansible/pull/32063)
+* Fix ios_logging smaller issues and make default size for buffered work:
+  (https://github.com/ansible/ansible/pull/32321)
+* Fix ios_logging module issue where facility is being deleted along with host:
+  (https://github.com/ansible/ansible/pull/32234)
+* Fix wrong prompt issue for network modules (https://github.com/ansible/ansible/pull/32426)
+* Fix eos_eapi to enable non-default vrfs if the default vrf is already configured (https://github.com/ansible/ansible/pull/32112)
+* Fix network parse_cli filter in case of single match is not caught when using start_block and end_block
+  (https://github.com/ansible/ansible/pull/31092)
+* Fix win_find failing on files it can't access, change behaviour to be more
+  like the find module (https://github.com/ansible/ansible/issues/31898)
+* Amended tracking of 'changed'
+  https://github.com/ansible/ansible/pull/31812
+* Fix label assignment in ovirt_host_networks
+  (https://github.com/ansible/ansible/pull/31973)
+* Fix fencing and kuma usage in ovirt_cluster module
+  (https://github.com/ansible/ansible/pull/32190)
+* Fix failure during upgrade due to NON_RESPONSIVE state for ovirt_hosts module
+  (https://github.com/ansible/ansible/pull/32192)
+* ini inventory format now correclty handles group creation w/o need for specific orders
+  https://github.com/ansible/ansible/pull/32471
+* Fix for quoted paths in win_service
+  (https://github.com/ansible/ansible/issues/32368)
+* Fix tracebacks for non-ascii paths when parsing inventory
+  (https://github.com/ansible/ansible/pull/32511)
+* Fix git archive when update is set to no
+  (https://github.com/ansible/ansible/pull/31829)
+* Fix locale when screen scraping in the yum module
+  (https://github.com/ansible/ansible/pull/32203)
+* Fix for validating proxy results on Python3 for modules making http requests:
+  (https://github.com/ansible/ansible/pull/32596)
+* Fix unreferenced variable in SNS topic module
+  (https://github.com/ansible/ansible/pull/29117)
+* Handle ignore_errors in loops
+  (https://github.com/ansible/ansible/pull/32546)
+* Fix running with closed stdin on python 3
+  (https://github.com/ansible/ansible/pull/31695)
+* Fix undefined variable in script inventory plugin
+  (https://github.com/ansible/ansible/pull/31381)
+* Fix win_copy on Python 2.x to support files greater than 4GB
+  (https://github.com/ansible/ansible/pull/32682)
+* Add extra error handling for wmare connect to correctly detect scenarios where
+  username does not have the required logon permissions
+  (https://github.com/ansible/ansible/pull/32613)
+* Fix ios_config file prompt issue while using save_when
+  (https://github.com/ansible/ansible/pull/32744)
+* Prevent host_group_vars plugin load errors when using 'path as inventory hostname'
+  https://github.com/ansible/ansible/issues/32764
+* Better errors when loading malformed vault envelopes
+  (https://github.com/ansible/ansible/issues/28038)
+* nxos_interface error handling
+  (https://github.com/ansible/ansible/pull/32846)
+* Fix snmp bugs on Nexus 3500 platform
+  (https://github.com/ansible/ansible/pull/32773)
+* nxos_config and nxos_facts - fixes for N35 platform
+  (https://github.com/ansible/ansible/pull/32762)
+* fix dci failure nxos
+  (https://github.com/ansible/ansible/pull/32877)
+* Do not execute `script` tasks is check mode (https://github.com/ansible/ansible/issues/30676)
+* Keep newlines when reading LXC container config file (https://github.com/ansible/ansible/pull/32219)
+* Fix a traceback in os_floating_ip when required instance is already present in the cloud:
+  https://github.com/ansible/ansible/pull/32887
+* Fix for modifying existing application load balancers using certificates (https://github.com/ansible/ansible/pull/28217)
+* Fix --ask-vault-pass with no tty and password from stdin
+  (https://github.com/ansible/ansible/issues/30993)
+* Fix for IIS windows modules to use hashtables instead of PSCustomObject
+  (https://github.com/ansible/ansible/pull/32710)
+* Fix nxos_snmp_host bug
+  (https://github.com/ansible/ansible/pull/32916)
+* Make IOS devices consistent ios_logging
+  (https://github.com/ansible/ansible/pull/33100)
+* restore error on orphan group:vars delcaration for ini inventories
+  https://github.com/ansible/ansible/pull/32866
+* restore host/group_vars merge order
+  https://github.com/ansible/ansible/pull/32963
+* use correct loop var when delegating
+  https://github.com/ansible/ansible/pull/32986
+* Handle sets and datetime objects in inventory sources fixing tracebacks
+  https://github.com/ansible/ansible/pull/32990
+* Fix for breaking change to Azure Python SDK DNS RecordSet constructor in azure-mgmt-dns==1.2.0
+  https://github.com/ansible/ansible/pull/33165
+* Fix for breaking change to Azure Python SDK that prevented some members from being returned in facts modules
+  https://github.com/ansible/ansible/pull/33169
+* restored glob/regex host pattern matching to traverse groups and hosts and not return after first found
+  https://github.com/ansible/ansible/pull/33158
+* change nxos_interface module to use "show interface" to support more platforms
+  https://github.com/ansible/ansible/pull/33037
+
+
 <a id="2.4.1"></a>
 
-## 2.4.1 "Dancing Days" - TBD
+## 2.4.1 "Dancing Days" - 2017-10-25
 
 ### Bugfixes
 
@@ -139,6 +334,9 @@
   https://github.com/ansible/ansible/issues/31786
 * Fix ansible-doc and ansible-console module-path option (https://github.com/ansible/ansible/pull/31744)
 * Fix for hostname module on RHEL 7.5 (https://github.com/ansible/ansible/issues/31811)
+* Fix provider password leak in logs for asa modules (https://github.com/ansible/ansible/issues/32343)
+* Fix tagging for dynamodb_table if region is not explicitly passed to the module (https://github.com/ansible/ansible/pull/32557)
+* Fix Python 3 decode error in `cloudflare_dns` (https://github.com/ansible/ansible/pull/32065)
 
 ### Known Bugs
 * Implicit localhost is getting ansible_connection from all:vars instead of
@@ -178,6 +376,8 @@
 * Windows modules now support the use of multiple shared module_utils files in the form of Powershell modules (.psm1), via `#Requires -Module Ansible.ModuleUtils.Whatever.psm1`
 * Python module argument_spec now supports custom validation logic by accepting a callable as the `type` argument.
 * Windows become_method: runas now works across all authtypes and will auto-elevate under UAC if WinRM user has "Act as part of the operating system" privilege
+* Do not escape backslashes in the template lookup plugin to mirror what the template module does
+  https://github.com/ansible/ansible/issues/26397
 
 ### Deprecations
 * The behaviour when specifying `--tags` (or `--skip-tags`) multiple times on the command line
@@ -221,7 +421,7 @@
 * Now deprecated configuration options issue warnings when set.
 * Removed unused and deprecated config option `pattern`
 * Updated the copy of six bundled for modules to use from 1.4.1 to 1.10.0
-* The `include_dir` var is not a global anymore, as we now allow multiple inventory sources, it is now host dependant.
+* The `inventory_dir` var is not a global anymore, as we now allow multiple inventory sources, it is now host dependant.
   This means it cannot be used wherever host vars are not permitted, for example in task/handler names.
 * Fixed a cornercase with ini inventory vars.  Previously, if an inventory var
   was a quoted string with hash marks ("#") in it then the parsed string
@@ -772,7 +972,6 @@
 ### Bugfixes
 * Fix alternatives module handlling of non existing options
 * Fix synchronize traceback with the docker connection plugin
-* Do not escape backslashes in the template lookup plugin to mirror what the template module does
 * Fix the expires option of the postgresq_user module
 * Fix for win_acl when settings permissions on registry objects that use `ALL APPLICATION PACKAGES` and `ALL RESTRICTED APPLICATION PACKAGES`
 * Python3 fixes
diff -Nru ansible-2.4.1.0/contrib/inventory/consul_io.py ansible-2.4.2.0/contrib/inventory/consul_io.py
--- ansible-2.4.1.0/contrib/inventory/consul_io.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/contrib/inventory/consul_io.py	2017-11-29 21:10:31.000000000 +0000
@@ -473,10 +473,7 @@
         scheme = 'http'
 
         if hasattr(self, 'url'):
-            try:
-                from urlparse import urlparse
-            except ImportError:
-                from urllib.parse import urlparse
+            from ansible.module_utils.six.moves.urllib.parse import urlparse
             o = urlparse(self.url)
             if o.hostname:
                 host = o.hostname
diff -Nru ansible-2.4.1.0/contrib/inventory/rudder.py ansible-2.4.2.0/contrib/inventory/rudder.py
--- ansible-2.4.1.0/contrib/inventory/rudder.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/contrib/inventory/rudder.py	2017-11-29 21:10:31.000000000 +0000
@@ -56,12 +56,8 @@
 import six
 import httplib2 as http
 from time import time
-from six.moves import configparser
-
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
+from ansible.module_utils.six.moves import configparser
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 
 try:
     import json
diff -Nru ansible-2.4.1.0/contrib/inventory/windows_azure.py ansible-2.4.2.0/contrib/inventory/windows_azure.py
--- ansible-2.4.1.0/contrib/inventory/windows_azure.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/contrib/inventory/windows_azure.py	2017-11-29 21:10:31.000000000 +0000
@@ -39,7 +39,7 @@
 import sys
 import argparse
 import os
-from urlparse import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 from time import time
 try:
     import json
diff -Nru ansible-2.4.1.0/debian/changelog ansible-2.4.2.0/debian/changelog
--- ansible-2.4.1.0/debian/changelog	2017-10-26 05:56:59.000000000 +0000
+++ ansible-2.4.2.0/debian/changelog	2017-11-29 21:11:16.000000000 +0000
@@ -1,8 +1,15 @@
-ansible (2.4.1.0-1ppa~precise) precise; urgency=low
+ansible (2.4.2.0-1ppa~precise) precise; urgency=low
 
-  * 2.4.1.0 release
+  * 2.4.2.0 release
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 29 Nov 2017 21:10:57 +0000
+
+ansible (2.4.2.0) unstable; urgency=low
+
+  * 2.4.2.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 29 Nov 2017 12:18:55 -0800
 
- -- Ansible, Inc. <info@ansible.com>  Thu, 26 Oct 2017 05:56:28 +0000
 
 ansible (2.4.1.0) unstable; urgency=low
 
diff -Nru ansible-2.4.1.0/debian/changeloge ansible-2.4.2.0/debian/changeloge
--- ansible-2.4.1.0/debian/changeloge	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/debian/changeloge	2017-11-29 21:10:32.000000000 +0000
@@ -4,6 +4,13 @@
 
  -- Ansible, Inc. <info@ansible.com>  %DATE%
 
+ansible (2.4.2.0) unstable; urgency=low
+
+  * 2.4.2.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 29 Nov 2017 12:18:55 -0800
+
+
 ansible (2.4.1.0) unstable; urgency=low
 
   * 2.4.1.0
diff -Nru ansible-2.4.1.0/docs/bin/dump_keywords.py ansible-2.4.2.0/docs/bin/dump_keywords.py
--- ansible-2.4.1.0/docs/bin/dump_keywords.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/bin/dump_keywords.py	2017-11-29 21:10:31.000000000 +0000
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 
 import optparse
-import yaml
+import re
+from distutils.version import LooseVersion
 
+import jinja2
+import yaml
 from jinja2 import Environment, FileSystemLoader
 
 from ansible.playbook import Play
@@ -18,7 +21,7 @@
 p = optparse.OptionParser(
     version='%prog 1.0',
     usage='usage: %prog [options]',
-    description='Generate module documentation from metadata',
+    description='Generate playbook keyword documentation from code and descriptions',
 )
 p.add_option("-T", "--template-dir", action="store", dest="template_dir", default="../templates", help="directory containing Jinja2 templates")
 p.add_option("-o", "--output-dir", action="store", dest="output_dir", default='/tmp/', help="Output directory for rst files")
@@ -65,5 +68,10 @@
 outputname = options.output_dir + template_file.replace('.j2', '')
 tempvars = {'oblist': oblist, 'clist': clist}
 
+keyword_page = template.render(tempvars)
+if LooseVersion(jinja2.__version__) < LooseVersion('2.10'):
+    # jinja2 < 2.10's indent filter indents blank lines.  Cleanup
+    keyword_page = re.sub(' +\n', '\n', keyword_page)
+
 with open(outputname, 'w') as f:
-    f.write(template.render(tempvars))
+    f.write(keyword_page)
diff -Nru ansible-2.4.1.0/docs/bin/plugin_formatter.py ansible-2.4.2.0/docs/bin/plugin_formatter.py
--- ansible-2.4.1.0/docs/bin/plugin_formatter.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/bin/plugin_formatter.py	2017-11-29 21:10:31.000000000 +0000
@@ -30,6 +30,9 @@
 import sys
 import warnings
 from collections import defaultdict
+from distutils.version import LooseVersion
+from pprint import PrettyPrinter
+
 try:
     from html import escape as html_escape
 except ImportError:
@@ -39,6 +42,7 @@
     def html_escape(text, quote=True):
         return cgi.escape(text, quote)
 
+import jinja2
 import yaml
 from jinja2 import Environment, FileSystemLoader
 from six import iteritems
@@ -382,6 +386,9 @@
             doc['returndocs'] = None
 
         text = templates['plugin'].render(doc)
+        if LooseVersion(jinja2.__version__) < LooseVersion('2.10'):
+            # jinja2 < 2.10's indent filter indents blank lines.  Cleanup
+            text = re.sub(' +\n', '\n', text)
 
         write_data(text, output_dir, outputname, module)
 
diff -Nru ansible-2.4.1.0/docs/docsite/keyword_desc.yml ansible-2.4.2.0/docs/docsite/keyword_desc.yml
--- ansible-2.4.1.0/docs/docsite/keyword_desc.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/keyword_desc.yml	2017-11-29 21:10:31.000000000 +0000
@@ -1,51 +1,68 @@
-accelerate: DEPRECATED, set to True to use accelerate connection plugin.
-accelerate_ipv6: "DEPRECATED, set to True to force accelerate plugin to use ipv6 for it's connection."
-accelerate_port: DEPRECATED, set to override default port use for accelerate connection.
+accelerate: "*DEPRECATED*, set to True to use accelerate connection plugin."
+accelerate_ipv6: "*DEPRECATED*, set to True to force accelerate plugin to use ipv6 for its connection."
+accelerate_port: "*DEPRECATED*, set to override default port use for accelerate connection."
 action: "The 'action' to execute for a task, it normally translates into a C(module) or action plugin."
-args: DEPRECATED, A secondary way to add arguments into a task, it takes a dictionary in which keys map to options and values .. well you get it.
+args: "*DEPRECATED*, A secondary way to add arguments into a task. Takes a dictionary in which keys map to options and values."
 always: List of tasks, in a block, that execute no matter if there is an error in the block or not.
-always_run: DEPRECATED, forces a task to run even in check mode, use :term:`check_mode` directive instead.
+always_run: "*DEPRECATED*, forces a task to run even in check mode. Use :term:`check_mode` directive instead."
 any_errors_fatal: Force any un-handled task errors on any host to propagate to all hosts and end the play.
 async: Run a task asyncronouslly if the C(action) supports this.
 become: Boolean that controls if privilege escalation is used or not on :term:`Task` execution.
 become_flags: A string of flag(s) to pass to the privilege escalation program when :term:`become` is True.
-become_method: Which method of privilege escalation to use. i.e. sudo/su/etc.
-become_user: "User that you 'become' after using privilege escalation, the remote/login user must have permissions to become this user."
+become_method: Which method of privilege escalation to use (such as sudo or su).
+become_user: "User that you 'become' after using privilege escalation. The remote/login user must have permissions to become this user."
 block: List of tasks in a block.
 changed_when: "Conditional expression that overrides the task's normal 'changed' status."
-check_mode: "A boolean that controls if a task is executed in 'check' mode"
-connection: Allows you to change the connection plugin used for tasks to execute on the target.
-delay: Number of seconds to delay between retries, this setting is only used in combination with :term:`until`.
-delegate_facts: Boolean that allows you to apply facts to delegated host instead of inventory_hostname.
-delegate_to: Host to execute task instead of the target (inventory_hostname), connection vars from the delegated host will also be used for the task.
+check_mode: |
+    A boolean that controls if a task is executed in 'check' mode
+
+    .. seealso:: :ref:`check_mode_dry`
+
+connection: |
+    Allows you to change the connection plugin used for tasks to execute on the target.
+
+    .. seealso:: :ref:`using_connection`
+
+delay: Number of seconds to delay between retries. This setting is only used in combination with :term:`until`.
+delegate_facts: Boolean that allows you to apply facts to a delegated host instead of inventory_hostname.
+delegate_to: Host to execute task instead of the target (inventory_hostname). Connection vars from the delegated host will also be used for the task.
 diff: "Toggle to make tasks return 'diff' information or not."
 environment: A dictionary that gets converted into environment vars to be provided for the task upon execution.
 fact_path: Set the fact path option for the fact gathering plugin controlled by :term:`gather_facts`.
 failed_when: "Conditional expression that overrides the task's normal 'failed' status."
-force_handlers: Will force notified handler execution for hosts even if they failed during the play, it will not trigger if the play itself fails.
+force_handlers: Will force notified handler execution for hosts even if they failed during the play. Will not trigger if the play itself fails.
 gather_facts: "A boolean that controls if the play will automatically run the 'setup' task to gather facts for the hosts."
 gather_subset: Allows you to pass subset options to the  fact gathering plugin controlled by :term:`gather_facts`.
 gather_timeout: Allows you to set the timeout for the fact gathering plugin controlled by :term:`gather_facts`.
-handlers: "A section with tasks that are treated as handlers, these won't get executed normally, only when notified. After each section of tasks is complete."
+handlers: "A section with tasks that are treated as handlers, these won't get executed normally, only when notified after each section of tasks is complete."
 hosts: "A list of groups, hosts or host pattern that translates into a list of hosts that are the play's target."
 ignore_errors: Boolean that allows you to ignore task failures and continue with play. It does not affect connection errors.
-loop_control: "Several keys here allow you to modify/set loop behaviour in a task see http://docs.ansible.com/ansible/latest/playbooks_loops.html#loop-control for details."
+loop: "Takes a list for the task to iterate over, saving each list element into the ``item`` variable (configurable via loop_control)"
+loop_control: |
+    Several keys here allow you to modify/set loop behaviour in a task.
+
+    .. seealso:: :ref:`loop_control`
+
 max_fail_percentage: can be used to abort the run after a given percentage of hosts in the current batch has failed.
-name: "It's a name, works mostly for documentation, in the case of tasks/handlers it can be an identifier."
+name: "Identifier. Can be used for documentation, in or tasks/handlers."
 no_log: Boolean that controls information disclosure.
-notify: "list of handlers to notify when the task returns a 'changed=True' status."
+notify: "List of handlers to notify when the task returns a 'changed=True' status."
 order: Controls the sorting of hosts as they are used for executing the play. Possible values are inventory (default), sorted, reverse_sorted, reverse_inventory and shuffle.
 poll: Sets the polling interval in seconds for async tasks (default 10s).
 port: Used to override the default port used in a connection.
 post_tasks: A list of tasks to execute after the :term:`tasks` section.
 pre_tasks: A list of tasks to execute before :term:`roles`.
-remote_user: User used to log into the target via the connection plugin. AKA login user.
+remote_user: User used to log into the target via the connection plugin.
 register: Name of variable that will contain task status and module return data.
 rescue: List of tasks in a :term:`block` that run if there is a task error in the main :term:`block` list.
 retries: "Number of retries before giving up in a :term:`until` loop. This setting is only used in combination with :term:`until`."
 roles: List of roles to be imported into the play
 run_once: Boolean that will bypass the host loop, forcing the task to execute on the first host available and will also apply any facts to all active hosts.
-serial: Defines the 'batch' of hosts to execute the current play until the end.
+serial: |
+    Explicitly define how Ansible batches the execution of the current play on the play's target
+
+    .. seealso:: :ref:`rolling_update_batch_size`
+
 strategy: Allows you to choose the connection plugin to use for the play.
 tags: Tags applied to the task or included tasks, this allows selecting subsets of tasks from the command line.
 tasks: Main list of tasks to execute in the play, they run after :term:`roles` and before :term:`post_tasks`.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/become.rst ansible-2.4.2.0/docs/docsite/rst/become.rst
--- ansible-2.4.1.0/docs/docsite/rst/become.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/become.rst	2017-11-29 21:10:31.000000000 +0000
@@ -8,7 +8,7 @@
 Become
 ``````
 Ansible allows you to 'become' another user, different from the user that logged into the machine (remote user). This is done using existing
-privilege escalation tools, which you probably already use or have configured, like `sudo`, `su`, `pfexec`, `doas`, `pbrun`, `dzdo`, `ksu` and others.
+privilege escalation tools, which you probably already use or have configured, like `sudo`, `su`, `pfexec`, `doas`, `pbrun`, `dzdo`, `ksu`, and others.
 
 
 .. note:: Before 1.9 Ansible mostly allowed the use of `sudo` and a limited use of `su` to allow a login/remote user to become a different user
diff -Nru ansible-2.4.1.0/docs/docsite/rst/committer_guidelines.rst ansible-2.4.2.0/docs/docsite/rst/committer_guidelines.rst
--- ansible-2.4.1.0/docs/docsite/rst/committer_guidelines.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/committer_guidelines.rst	2017-11-29 21:10:31.000000000 +0000
@@ -60,7 +60,7 @@
   - Discuss with other committers, specially when you are unsure of something.
   - Document! If your PR is a new feature or a change to behavior, make sure you've updated all associated documentation or have notified the right people to do so. It also helps to add the version of Core against which this documentation is compatible (to avoid confusion with stable versus devel docs, for backwards compatibility, etc.).
   - Consider scope, sometimes a fix can be generalized
-  - Keep it simple, then things are maintainable, debuggable and intelligible.
+  - Keep it simple, then things are maintainable, debuggable, and intelligible.
 
 Committers are expected to continue to follow the same community and contribution guidelines followed by the rest of the Ansible community. 
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/community.rst ansible-2.4.2.0/docs/docsite/rst/community.rst
--- ansible-2.4.1.0/docs/docsite/rst/community.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/community.rst	2017-11-29 21:10:31.000000000 +0000
@@ -45,7 +45,7 @@
 You can help share Ansible with others by telling friends and colleagues, writing a blog post,
 or presenting at user groups (like DevOps groups or the local LUG).
 
-You are also welcome to share slides on speakerdeck, sign up for a free account and tag it "Ansible". On Twitter,
+You are also welcome to share slides on speakerdeck, sign up for a free account, and tag it "Ansible". On Twitter,
 you can also share things with #ansible and may wish to `follow us <https://twitter.com/ansible>`_.
 
 I'd Like To Help Ansible Move Faster
@@ -171,7 +171,7 @@
 are interested in writing new modules to be included in the core Ansible distribution, please refer
 to the `module development documentation <http://docs.ansible.com/developing_modules.html>`_.
 
-Ansible's aesthetic encourages simple, readable code and consistent,
+Ansible's aesthetic encourages simple, readable code, and consistent,
 conservatively extending, backwards-compatible improvements. When contributing code to Ansible,
 please observe the following guidelines:
 
@@ -182,7 +182,7 @@
 - We are not strictly compliant with PEP8. See :doc:`dev_guide/testing_pep8` for more information.
 
 You can also contribute by testing and revising other requests, especially if it is one you are interested
-in using. Please keep your comments clear and to the point, courteous and constructive, tickets are not a
+in using. Please keep your comments clear, to the point, courteous, and constructive, tickets are not a
 good place to start discussions (ansible-devel and IRC exist for this).
 
 Tip: To easily run from a checkout, source ``./hacking/env-setup`` and that's it -- no install
@@ -194,7 +194,7 @@
 Ansible Staff
 -------------
 
-Ansible, Inc is a company supporting Ansible and building additional solutions based on
+Ansible, Inc. is a company supporting Ansible and building additional solutions based on
 Ansible.  We also do services and support for those that are interested. We also offer an
 enterprise web front end to Ansible (see Tower below).
 
@@ -310,7 +310,7 @@
 anti-harassment policy. We expect organizers to enforce these guidelines throughout all events,
 and we expect attendees, speakers, sponsors, and volunteers to help ensure a safe
 environment for our whole community. Specifically, this Code of Conduct covers
-participation in all Ansible-related forums and mailing lists, code and documentation
+participation in all Ansible-related forums, mailing lists, code, documentation
 contributions, public IRC channels, private correspondence, and public meetings.
 
 Ansible community members are...
@@ -341,7 +341,7 @@
 **Kind**
 
 Everyone should feel welcome in the Ansible community, regardless of their background.
-Please be courteous, respectful and polite to fellow community members. Do not make or
+Please be courteous, respectful, and polite to fellow community members. Do not make or
 post offensive comments related to skill level, gender, gender identity or expression,
 sexual orientation, disability, physical appearance, body size, race, or religion.
 Sexualized images or imagery, real or implied violence, intimidation, oppression,
diff -Nru ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing/sanity/azure-requirements.rst ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing/sanity/azure-requirements.rst
--- ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing/sanity/azure-requirements.rst	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing/sanity/azure-requirements.rst	2017-11-29 21:10:31.000000000 +0000
@@ -0,0 +1,10 @@
+Sanity Tests » azure-requirements
+=================================
+
+Update the Azure integration test requirements file when changes are made to the Azure packaging requirements file:
+
+.. code-block:: bash
+
+    cp packaging/requirements/requirements-azure.txt test/runner/requirements/integration.cloud.azure.txt
+
+This copy of the requirements file is used when building the ``ansible/ansible:default`` Docker container from ``test/runner/Dockerfile``.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing.rst ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing.rst
--- ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing.rst	2017-11-29 21:10:31.000000000 +0000
@@ -33,9 +33,14 @@
   * Tests directly against individual parts of the code base.
 
 
-If you're a developer, one of the most valuable things you can do is look at the GitHub issues list and help fix bugs.  We almost always prioritize bug fixing over feature development, so helping to fix bugs is one of the best things you can do.
-
-Even if you're not a developer, helping to test pull requests for bug fixes and features is still immensely valuable.
+If you're a developer, one of the most valuable things you can do is look at the GitHub
+issues list and help fix bugs.  We almost always prioritize bug fixing over feature
+development.
+
+Even for non developers, helping to test pull requests for bug fixes and features is still
+immensely valuable.  Ansible users who understand writing playbooks and roles should be
+able to add integration tests and so Github pull requests with integration tests that show
+bugs in action will also be a great way to help.
 
 
 Testing within GitHub & Shippable
@@ -47,7 +52,6 @@
 
 When Pull Requests (PRs) are created they are tested using Shippable, a Continuous Integration (CI) tool. Results are shown at the end of every PR.
 
-
 When Shippable detects an error and it can be linked back to a file that has been modified in the PR then the relevant lines will be added as a GitHub comment. For example::
 
    The test `ansible-test sanity --test pep8` failed with the following errors:
@@ -69,7 +73,6 @@
   ansible-test sanity --test pep8
   ansible-test sanity --test validate-modules
 
-
 If there isn't a GitHub comment stating what's failed you can inspect the results by clicking on the "Details" button under the "checks have failed" message at the end of the PR.
 
 Rerunning a failing CI job
@@ -91,10 +94,6 @@
 How to test a PR
 ================
 
-If you're a developer, one of the most valuable things you can do is look at the GitHub issues list and help fix bugs.  We almost always prioritize bug fixing over feature development, so helping to fix bugs is one of the best things you can do.
-
-Even if you're not a developer, helping to test pull requests for bug fixes and features is still immensely valuable.
-
 Ideally, code should add tests that prove that the code works. That's not always possible and tests are not always comprehensive, especially when a user doesn't have access to a wide variety of platforms, or is using an API or web service. In these cases, live testing against real equipment can be more valuable than automation that runs against simulated interfaces. In any case, things should always be tested manually the first time as well.
 
 Thankfully, helping to test Ansible is pretty straightforward, assuming you are familiar with how Ansible works.
@@ -188,8 +187,26 @@
    |   some other output
    |   \```
 
+Code Coverage Online
+````````````````````
+
+`The online code coverage reports <https://codecov.io/gh/ansible/ansible>` are a good way
+to identify areas for testing improvement in Ansible.  By following red colors you can
+drill down through the reports to find files which have no tests at all.  Adding both
+integration and unit tests which show clearly how code should work, verify important
+Ansible functions and increase testing coverage in areas where there is none is a valuable
+way to help improve Ansible.
+
+The code coverage reports only cover the ``devel`` branch of Ansible where new feature
+development takes place.  Pull requests and new code will be missing from the codecov.io
+coverage reports so local reporting is needed.  Most ``ansible-test`` commands allow you
+to collect code coverage, this is particularly useful to indicate where to extend
+testing. See :doc:`testing_running_locally` for more information.
+
+
 Want to know more about testing?
 ================================
 
-If you'd like to know more about the plans for improving testing Ansible then why not join the `Testing Working Group <https://github.com/ansible/community/blob/master/meetings/README.md>`_.
+If you'd like to know more about the plans for improving testing Ansible then why not join the
+`Testing Working Group <https://github.com/ansible/community/blob/master/meetings/README.md>`_.
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing_running_locally.rst ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing_running_locally.rst
--- ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing_running_locally.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing_running_locally.rst	2017-11-29 21:10:31.000000000 +0000
@@ -45,7 +45,19 @@
 Code Coverage
 =============
 
-Add the ``--coverage`` option to any test command to collect code coverage data.
+Code coverage reports make it easy to identify untested code for which more tests should
+be written.  Online reports are available but only cover the ``devel`` branch (see
+:doc:`testing`).  For new code local reports are needed.
+
+Add the ``--coverage`` option to any test command to collect code coverage data.  If you
+aren't using the ``--tox`` or ``--docker`` options which create an isolated python
+environment then you may have to use the ``--requirements`` option to ensure that the
+correct version of the coverage module is installed
+
+   ansible-test units --coverage apt
+   ansible-test integration --coverage aws_lambda --tox --requirements
+   ansible-test coverage html
+
 
 Reports can be generated in several different formats:
 
@@ -53,4 +65,7 @@
 * ``ansible-test coverage html`` - HTML report.
 * ``ansible-test coverage xml`` - XML report.
 
-To clear data between test runs, use the ``ansible-test coverage erase`` command.
+To clear data between test runs, use the ``ansible-test coverage erase`` command. For a full list of features see the online help::
+
+   ansible-test coverage --help
+
diff -Nru ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing_units_modules.rst ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing_units_modules.rst
--- ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing_units_modules.rst	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing_units_modules.rst	2017-11-29 21:10:31.000000000 +0000
@@ -0,0 +1,555 @@
+****************************
+Unit Testing Ansible Modules
+****************************
+
+.. contents:: Topics
+
+Introduction
+============
+
+This document explains why, how and when you should use unit tests for Ansible modules.
+The document doesn't apply to other parts of Ansible for which the recommendations are
+normally closer to the Python standard.  There is basic documentation for Ansible unit
+tests in the developer guide :doc:`testing_units`.  This document should
+be readable for a new Ansible module author. If you find it incomplete or confusing, 
+please open a bug or ask for help on Ansible IRC.
+
+What Are Unit Tests?
+====================
+
+Ansible includes a set of unit tests in the :file:`test/unit` directory. These tests primarily cover the
+internals but can also can cover Ansible modules.  The structure of the unit tests matches
+the structure of the code base, so the tests that reside in the :file:`test/unit/modules/` directory
+are organized by module groups.
+
+Integration tests can be used for most modules, but there are situations where
+cases cannot be verified using integration tests.  This means that Ansible unit test cases
+may extend beyond testing only minimal units and in some cases will include some
+level of functional testing.
+
+
+Why Use Unit Tests?
+===================
+
+Ansible unit tests have advantages and disadvantages. It is important to understand these.
+Advantages include:
+
+* Most unit tests are much faster than most Ansible integration tests.  The complete suite
+  of unit tests can be run regularly by a developer on their local system.
+* Unit tests can be run by developers who don't have access to the system which the module is
+  designed to work on, allowing a level of verification that changes to core functions
+  haven't broken module expectations.
+* Unit tests can easily substitute system functions allowing testing of software that
+  would be impractical.  For example, the ``sleep()`` function can be replaced and we check
+  that a ten minute sleep was called without actually waiting ten minutes.
+* Unit tests are run on different Python versions. This allows us to
+  ensure that the code behaves in the same way on different Python versions.
+
+There are also some potential disadvantages of unit tests. Unit tests don't normally
+directly test actual useful valuable features of software, instead just internal
+implementation
+
+* Unit tests that test the internal, non-visible features of software may make
+  refactoring difficult if those internal features have to change (see also naming in How
+  below)
+* Even if the internal feature is working correctly it is possible that there will be a
+  problem between the internal code tested and the actual result delivered to the user
+
+Normally the Ansible integration tests (which are written in Ansible YAML) provide better
+testing for most module functionality.  If those tests already test a feature and perform
+well there may be little point in providing a unit test covering the same area as well.
+
+When To Use Unit Tests
+======================
+
+There are a number of situations where unit tests are a better choice than integration
+tests. For example, testing things which are impossible, slow or very difficult to test
+with integration tests, such as:
+    
+* Forcing rare / strange / random situations that can't be forced, such as specific network
+  failures and exceptions
+* Extensive testing of slow configuration APIs 
+* Situations where the integration tests cannot be run as part of the main Ansible
+  continuous integraiton running in Shippable.
+
+
+
+Providing quick feedback
+------------------------
+
+Example:
+  A single step of the rds_instance test cases can take up to 20
+  minutes (the time to create an RDS instance in Amazon).  The entire
+  test run can last for well over an hour.  All 16 of the unit tests
+  complete execution in less than 2 seconds.
+
+The time saving provided by being able to run the code in a unit test makes it worth
+creating a unit test when bug fixing a module, even if those tests do not often identify
+problems later.  As a basic goal, every module should have at least one unit test which
+will give quick feedback in easy cases without having to wait for the integration tests to
+complete.
+    
+Ensuring correct use of external interfaces
+-------------------------------------------
+
+Unit tests can check the way in which external services are run to ensure that they match 
+specifications or are as efficient as possible *even when the final output will not be changed*.
+
+Example:
+  Package managers are often far more efficient when installing multiple packages at once
+  rather than each package separately. The final result is the
+  same: the packages are all installed, so the efficiency is difficult to verify through
+  integration tests. By providing a mock package manager and verifying that it is called
+  once, we can build a valuable test for module efficiency.
+
+Another related use is in the situation where an API has versions which behave
+differently. A programmer working on a new version may change the module to work with the
+new API version and unintentially break the old version.  A test case
+which checks that the call happens properly for the old version can help avoid the
+problem.  In this situation it is very important to include version numbering in the test case
+name (see `Naming unit tests`_ below).
+
+Providing specific design tests 
+--------------------------------
+
+By building a requirement for a particular part of the
+code and then coding to that requirement, unit tests _can_ sometimes improve the code and
+help future developers understand that code. 
+
+Unit tests that test internal implementation details of code, on the other hand, almost
+always do more harm than good.  Testing that your packages to install are stored in a list
+would slow down and confuse a future developer who might need to change that list into a
+dictionary for efficiency. This problem can be reduced somewhat with clear test naming so
+that the future developer immediately knows to delete the test case, but it is often
+better to simply leave out the test case altogether and test for a real valuable feature
+of the code, such as installing all of the packages supplied as arguments to the module. 
+
+
+How to unit test Ansible modules
+================================
+
+There are a number of techniques for unit testing modules.  Beware that most
+modules without unit tests are structured in a way that makes testing quite difficult and
+can lead to very complicated tests which need more work than the code.  Effectively using unit
+tests may lead you to restructure your code. This is often a good thing and leads
+to better code overall. Good restructuring can make your code clearer and easier to understand.
+
+
+Naming unit tests
+-----------------
+
+Unit tests should have logical names. If a developer working on the module being tested
+breaks the test case, it should be easy to figure what the unit test covers from the name.
+If a unit test is designed to verify compatibility with a specific software or API version
+then include the version in the name of the unit test.
+
+As an example, ``test_v2_state_present_should_call_create_server_with_name()`` would be a
+good name, ``test_create_server()`` would not be.  
+
+
+Use of Mocks
+------------
+
+Mock objects (from https://docs.python.org/3/library/unittest.mock.html) can be very
+useful in building unit tests for special / difficult cases, but they can also
+lead to complex and confusing coding situations.  One good use for mocks would be in
+simulating an API. As for 'six', the 'mock' python package is bundled with Ansible (use
+'import ansible.compat.tests.mock'). See for example
+
+Ensuring failure cases are visible with mock objects
+----------------------------------------------------
+
+Functions like module.fail_json() are normally expected to terminate execution. When you 
+run with a mock module object this doesn't happen since the mock always returns another mock 
+from a function call. You can set up the mock to raise an exception as shown above, or you can
+assert that these functions have not been called in each test. For example::
+
+  module = MagicMock()
+  function_to_test(module, argument)
+  module.fail_json.assert_not_called() 
+
+This applies not only to calling the main module but almost any other
+function in a module which gets the module object.  
+
+
+Mocking of the actual module
+----------------------------
+
+The setup of an actual module is quite complex (see `Passing Arguments`_ below) and often
+isn't needed for most functions which use a module. Instead you can use a mock object as
+the module and create any module attributes needed by the function you are testing. If
+you do this, beware that the module exit functions need special handling as mentioned
+above, either by throwing an exception or ensuring that they haven't been called. For example::
+
+    class AnsibleExitJson(Exception):
+        """Exception class to be raised by module.exit_json and caught by the test case"""
+        pass
+    #you may also do the same to fail json
+    module=MagicMock()
+    module.exit_json.side_effect = AnsibleExitJson(Exception)
+    with self.assertRaises(AnsibleExitJson) as result:
+        return = my_module.test_this_function(module, argument)
+    module.fail_json.assert_not_called() 
+    assert return["changed"] == True
+    
+API definition with unit test cases
+-----------------------------------
+
+API interaction is usually best tested with the function tests defined in Ansible's
+integration testing section, which run against the actual API.  There are several cases
+where the unit tests are likely to work better.
+
+Defining a module against an API specification
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This case is especially important for modules interacting with web services, which provide
+an API that Ansible uses but which are beyond the control of the user.
+
+By writing a custom emulation of the calls that return data from the API, we can ensure
+that only the features which are clearly defined in the specification of the API are
+present in the message.  This means that we can check that we use the correct
+parameters and nothing else.
+
+
+*Example:  in rds_instance unit tests a simple instance state is defined*::
+
+    def simple_instance_list(status, pending):
+        return {u'DBInstances': [{u'DBInstanceArn': 'arn:aws:rds:us-east-1:1234567890:db:fakedb',
+                                  u'DBInstanceStatus': status,
+                                  u'PendingModifiedValues': pending,
+                                  u'DBInstanceIdentifier': 'fakedb'}]}
+
+This is then used to create a list of states::
+
+    rds_client_double = MagicMock()
+    rds_client_double.describe_db_instances.side_effect = [
+        simple_instance_list('rebooting', {"a": "b", "c": "d"}),
+        simple_instance_list('available', {"c": "d", "e": "f"}),
+        simple_instance_list('rebooting', {"a": "b"}),
+        simple_instance_list('rebooting', {"e": "f", "g": "h"}),
+        simple_instance_list('rebooting', {}),
+        simple_instance_list('available', {"g": "h", "i": "j"}),
+        simple_instance_list('rebooting', {"i": "j", "k": "l"}),
+        simple_instance_list('available', {}),
+        simple_instance_list('available', {}),
+    ]
+    
+These states are then used as returns from a mock object to ensure that the ``await`` function
+waits through all of the states that would mean the RDS instance has not yet completed
+configuration::
+
+   rds_i.await_resource(rds_client_double, "some-instance", "available", mod_mock,
+                        await_pending=1)
+   assert(len(sleeper_double.mock_calls) > 5), "await_pending didn't wait enough"
+
+By doing this we check that the ``await`` function will keep waiting through
+potentially unusual that it would be impossible to reliably trigger through the
+integration tests but which happen unpredictably in reality.
+
+Defining a module to work against multiple API versions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This case is especially important for modules interacting with many different versions of
+software; for example, package installation modules that might be expected to work with
+many different operating system versions.
+
+By using previously stored data from various versions of an API we can ensure that the
+code is tested against the actual data which will be sent from that version of the system
+even when the version is very obscure and unlikely to be available during testing.
+
+Ansible special cases for unit testing
+======================================
+
+There are a number of special cases for unit testing the environment of an Ansible module.
+The most common are documented below, and suggestions for others can be found by looking
+at the source code of the existing unit tests or asking on the Ansible IRC channel or mailing
+lists.
+
+Module argument processing 
+--------------------------
+
+There are two problems with running the main function of a module:  
+
+* Since the module is supposed to accept arguments on ``STDIN`` it is a bit difficult to
+  set up the arguments correctly so that the module will get them as parameters.
+* All modules should finish by calling either the ``module.fail_json`` or
+  ``module.exit_json``, but these won't work correctly in a testing environment.
+
+Passing Arguments
+-----------------
+
+.. This section should be updated once https://github.com/ansible/ansible/pull/31456 is
+   closed since the function below will be provided in a library file.
+
+To pass arguments to a module correctly, use a function that stores the
+parameters in a special string variable.  Module creation and argument processing is
+handled through the AnsibleModule object in the basic section of the utilities. Normally
+this accepts input on ``STDIN``, which is not convenient for unit testing. When the special
+variable is set it will be treated as if the input came on ``STDIN`` to the module.::
+
+    import json
+    from ansible.module_utils._text import to_bytes
+
+    def set_module_args(args):
+        args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
+        basic._ANSIBLE_ARGS = to_bytes(args)
+
+    simply call that function before setting up your module
+
+        def test_already_registered(self):
+            set_module_args({
+                'activationkey': 'key',
+                'username': 'user',
+                'password': 'pass',
+            })
+
+Handling exit correctly
+-----------------------
+
+.. This section should be updated once https://github.com/ansible/ansible/pull/31456 is
+   closed since the exit and failure functions below will be provided in a library file.
+
+The ``module.exit_json()`` function won't work properly in a testing environment since it
+writes error information to ``STDOUT`` upon exit, where it
+is difficult to examine. This can be mitigated by replacing it (and module.fail_json) with
+a function that raises an exception::
+
+    def exit_json(*args, **kwargs):
+        if 'changed' not in kwargs:
+            kwargs['changed'] = False
+        raise AnsibleExitJson(kwargs)
+
+Now you can ensure that the first function called is the one you expected simply by
+testing for the correct exception::
+
+    def test_returned_value(self):
+        set_module_args({
+            'activationkey': 'key',
+            'username': 'user',
+            'password': 'pass',
+        })
+       with self.assertRaises(AnsibleExitJson) as result:
+           my_module.main()
+
+The same technique can be used to replace ``module.fail_json()`` (which is used for failure
+returns from modules) and for the ``aws_module.fail_json_aws()`` (used in modules for Amazon
+Web Services).
+
+Running the main function
+-------------------------
+
+If you do want to run the actual main function of a module you must import the module, set
+the arguments as above, set up the appropriate exit exception and then run the module::
+
+    # This test is based around pytest's features for individual test functions
+    import pytest
+    import ansible.modules.module.group.my_modulle as my_module
+
+    def test_main_function(monkeypatch):
+        monkeypatch.setattr(my_module.AnsibleModule, "exit_json", fake_exit_json)
+        set_module_args({
+            'activationkey': 'key',
+            'username': 'user',
+            'password': 'pass',
+        })
+        my_module.main()
+
+
+Handling calls to external executables
+--------------------------------------
+
+Module must use AnsibleModule.run_command in order to execute an external command. This
+method needs to be mocked:
+
+Here is a simple mock of AnsibleModule.run_command (taken from test/units/modules/packaging/os/test_rhn_register.py and
+test/units/modules/packaging/os/rhn_utils.py)::
+
+        with patch.object(basic.AnsibleModule, 'run_command') as run_command:
+            run_command.return_value = 0, '', ''  # successful execution, no output
+                with self.assertRaises(AnsibleExitJson) as result:
+                    self.module.main()
+                self.assertFalse(result.exception.args[0]['changed'])
+        # Check that run_command has been called
+        run_command.assert_called_once_with('/usr/bin/command args')
+        self.assertEqual(run_command.call_count, 1)
+        self.assertFalse(run_command.called)
+
+
+A Complete Example
+------------------
+
+The following example is a complete skeleton that reuses the mocks explained above and adds a new
+mock for Ansible.get_bin_path::
+    
+    import json
+
+    from ansible.compat.tests import unittest
+    from ansible.compat.tests.mock import patch
+    from ansible.module_utils import basic
+    from ansible.module_utils._text import to_bytes
+    from ansible.modules.namespace import my_module
+
+
+    def set_module_args(args):
+        """prepare arguments so that they will be picked up during module creation"""
+        args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
+        basic._ANSIBLE_ARGS = to_bytes(args)
+
+
+    class AnsibleExitJson(Exception):
+        """Exception class to be raised by module.exit_json and caught by the test case"""
+        pass
+
+
+    class AnsibleFailJson(Exception):
+        """Exception class to be raised by module.fail_json and caught by the test case"""
+        pass
+
+
+    def exit_json(*args, **kwargs):
+        """function to patch over exit_json; package return data into an exception"""
+        if 'changed' not in kwargs:
+            kwargs['changed'] = False
+        raise AnsibleExitJson(kwargs)
+
+
+    def fail_json(*args, **kwargs):
+        """function to patch over fail_json; package return data into an exception"""
+        kwargs['failed'] = True
+        raise AnsibleFailJson(kwargs)
+
+
+    def get_bin_path(self, arg, required=False):
+        """Mock AnsibleModule.get_bin_path"""
+        if arg.endswith('my_command'):
+            return '/usr/bin/my_command'
+        else:
+            if required:
+                fail_json(msg='%r not found !' % arg)
+
+
+    class TestMyModule(unittest.TestCase):
+
+        def setUp(self):
+            self.mock_module_helper = patch.multiple(basic.AnsibleModule,
+                                                     exit_json=exit_json,
+                                                     fail_json=fail_json,
+                                                     get_bin_path=get_bin_path)
+            self.mock_module_helper.start()
+            self.addCleanup(self.mock_module_helper.stop)
+
+        def test_module_fail_when_required_args_missing(self):
+            with self.assertRaises(AnsibleFailJson):
+                set_module_args({})
+                self.module.main()
+
+
+        def test_ensure_command_called(self):
+            set_module_args({
+                'param1': 10,
+                'param2': 'test',
+            })
+
+            with patch.object(basic.AnsibleModule, 'run_command') as mock_run_command:
+                stdout = 'configuration updated'
+                stderr = ''
+                rc = 0
+                mock_run_command.return_value = rc, stdout, stderr  # successful execution
+
+                with self.assertRaises(AnsibleExitJson) as result:
+                    my_module.main()
+                self.assertFalse(result.exception.args[0]['changed']) # ensure result is changed
+
+            mock_run_command.assert_called_once_with('/usr/bin/my_command --value 10 --name test')
+
+
+Restructuring modules to enable testing module set up and other processes
+-------------------------------------------------------------------------
+
+Often modules have a main() function which sets up the module and then performs other
+actions. This can make it difficult to check argument processing. This can be made easier by
+moving module configuration and initialization into a separate function. For example::
+
+    argument_spec = dict(
+        # module function variables
+        state=dict(choices=['absent', 'present', 'rebooted', 'restarted'], default='present'),
+        apply_immediately=dict(type='bool', default=False),
+        wait=dict(type='bool', default=False),
+        wait_timeout=dict(type='int', default=600),
+        allocated_storage=dict(type='int', aliases=['size']),
+        db_instance_identifier=dict(aliases=["id"], required=True),
+    )
+
+    def setup_module_object():
+        module = AnsibleAWSModule(
+            argument_spec=argument_spec,
+            required_if=required_if,
+            mutually_exclusive=[['old_instance_id', 'source_db_instance_identifier',
+                                 'db_snapshot_identifier']],
+        )
+        return module
+
+    def main():
+        module = setup_module_object()
+        validate_parameters(module)
+        conn = setup_client(module)
+        return_dict = run_task(module, conn)
+        module.exit_json(**return_dict)
+
+This now makes it possible to run tests against the module initiation function::
+
+    def test_rds_module_setup_fails_if_db_instance_identifier_parameter_missing():
+        # db_instance_identifier parameter is missing
+        set_module_args({
+            'state': 'absent',
+            'apply_immediately': 'True',
+         })
+
+        with self.assertRaises(AnsibleFailJson) as result:
+             self.module.setup_json
+
+See also ``test/units/module_utils/aws/test_rds.py``
+
+Note that the argument_spec dictionary is visible in a module variable. This has
+advantages, both in allowing explicit testing of the arguments and in allowing the easy
+creation of module objects for testing.
+
+The same restructuring technique can be valuable for testing other functionality, such as the part of the module which queries the object that the module configures.
+
+Traps for maintaining Python 2 compatibility
+============================================
+
+If you use the ``mock`` library from the Python 2.6 standard library, a number of the
+assert functions are missing but will return as if successful.  This means that test cases should take great care *not* use
+functions marked as _new_ in the Python 3 documentation, since the tests will likely always
+succeed even if the code is broken when run on older versions of Python.
+
+A helpful development approach to this should be to ensure that all of the tests have been
+run under Python 2.6 and that each assertion in the test cases has been checked to work by breaking
+the code in Ansible to trigger that failure.
+
+.. seealso::
+
+   :doc:`testing_units`
+       Ansible unit tests documentation
+   :doc:`testing_running_locally`
+       Running tests locally including gathering and reporting coverage data
+   :doc:`developing_modules`
+       How to develop modules
+   `Python 3 documentation - 26.4. unittest — Unit testing framework <https://docs.python.org/3/library/unittest.html>`_
+       The documentation of the unittest framework in python 3 
+   `Python 2 documentation - 25.3. unittest — Unit testing framework <https://docs.python.org/3/library/unittest.html>`_
+       The documentation of the earliest supported unittest framework - from Python 2.6
+   `pytest: helps you write better programs <https://docs.pytest.org/en/latest/>`_
+       The documentation of pytest - the framework actually used to run Ansible unit tests
+   `Development Mailing List <http://groups.google.com/group/ansible-devel>`_
+       Mailing list for development topics
+   `Testing Your Code (from The Hitchhiker's Guide to Python!) <http://docs.python-guide.org/en/latest/writing/tests/>`_
+       General advice on testing Python code
+   `Uncle Bob's many videos on YouTube <https://www.youtube.com/watch?v=QedpQjxBPMA&list=PLlu0CT-JnSasQzGrGzddSczJQQU7295D2>`_
+       Unit testing is a part of the of various philosophies of software development, including
+       Extreme Programming (XP), Clean Coding.  Uncle Bob talks through how to benfit from this
+   `"Why Most Unit Testing is Waste" http://rbcs-us.com/documents/Why-Most-Unit-Testing-is-Waste.pdf`
+       An article warning against the costs of unit testing
+   `'A Response to "Why Most Unit Testing is Waste"' https://henrikwarne.com/2014/09/04/a-response-to-why-most-unit-testing-is-waste/` 
+       An response pointing to how to maintain the value of unit tests
diff -Nru ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing_units.rst ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing_units.rst
--- ansible-2.4.1.0/docs/docsite/rst/dev_guide/testing_units.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/dev_guide/testing_units.rst	2017-11-29 21:10:31.000000000 +0000
@@ -2,19 +2,24 @@
 Unit Tests
 **********
 
-Unit tests are small isolated tests that target a specific library or module.
+Unit tests are small isolated tests that target a specific library or module.  Unit tests
+in Ansible are currently the only way of driving tests from python within Ansible's
+continuous integration process. This means that in some circumstances the tests may be a
+bit wider than just units.
 
 .. contents:: Topics
 
 Available Tests
 ===============
 
-Unit tests can be found in `test/units <https://github.com/ansible/ansible/tree/devel/test/units>`_, notice that the directory structure matches that of ``lib/ansible/``
+Unit tests can be found in `test/units
+<https://github.com/ansible/ansible/tree/devel/test/units>`_. Notice that the directory
+structure of the tests matches that of ``lib/ansible/``.
 
 Running Tests
 =============
 
-Unit tests can be run across the whole code base by doing:
+The Ansible unit tests can be run across the whole code base by doing:
 
 .. code:: shell
 
@@ -35,18 +40,22 @@
    ansible-test units --tox --python 2.7 apt
 
 
-
 For advanced usage see the online help::
 
    ansible-test units --help
 
+You can also run tests in Ansible's continuous integration system by opening a pull
+request.  This will automatically determine which tests to run based on the changes made
+in your pull request.
+
 
 Installing dependencies
 =======================
 
-``ansible-test`` has a number of dependencies , for ``units`` tests we suggest using ``tox``
+``ansible-test`` has a number of dependencies. For ``units`` tests we suggest using ``tox``.
 
-The dependencies can be installed using the ``--requirements`` argument, which will install all the required dependencies needed for unit tests. For example:
+The dependencies can be installed using the ``--requirements`` argument, which will
+install all the required dependencies needed for unit tests. For example:
 
 .. code:: shell
 
@@ -58,7 +67,11 @@
    When using ``ansible-test`` with ``--tox`` requires tox >= 2.5.0
 
 
-The full list of requirements can be found at `test/runner/requirements <https://github.com/ansible/ansible/tree/devel/test/runner/requirements>`_. Requirements files are named after their respective commands. See also the `constraints <https://github.com/ansible/ansible/blob/devel/test/runner/requirements/constraints.txt>`_ applicable to all commands.
+The full list of requirements can be found at `test/runner/requirements
+<https://github.com/ansible/ansible/tree/devel/test/runner/requirements>`_. Requirements
+files are named after their respective commands. See also the `constraints
+<https://github.com/ansible/ansible/blob/devel/test/runner/requirements/constraints.txt>`_
+applicable to all commands.
 
 
 Extending unit tests
@@ -67,22 +80,98 @@
 
 .. warning:: What a unit test isn't
 
-   If you start writing a test that requires external services then you may be writing an integration test, rather than a unit test.
+   If you start writing a test that requires external services then
+   you may be writing an integration test, rather than a unit test.
+
+
+Structuring Unit Tests
+``````````````````````
+
+Ansible drives unit tests through `pytest <https://docs.pytest.org/en/latest/>`_. This
+means that tests can either be written a simple functions which are included in any file
+name like ``test_<something>.py`` or as classes. 
+
+Here is an example of a function::
+
+  #this function will be called simply because it is called test_*()
+
+  def test_add()
+      a = 10
+      b = 23
+      c = 33
+      assert a + b = c
+    
+Here is an example of a class::
+
+  import unittest:
+      
+  class AddTester(unittest.TestCase)
+      
+      def SetUp()
+          self.a = 10
+          self.b = 23
+ 
+      # this function will 
+      def test_add()
+        c = 33
+        assert self.a + self.b = c
+
+     # this function will 
+      def test_subtract()
+        c = -13
+        assert self.a - self.b = c
+
+Both methods work fine in most circumstances; the function-based interface is simpler and
+quicker and so that's probably where you should start when you are just trying to add a
+few basic tests for a module.  The class-based test allows more tidy set up and tear down
+of pre-requisites, so if you have many test cases for your module you may want to refactor
+to use that.  
+
+Assertions using the simple ``assert`` function inside the tests will give give full
+information on the cause of the failure with a trace-back of functions called during the
+assertion.  This means that plain asserts are recommended over other external assertion
+libraries.
+
+A number of the unit test suites include functions that are shared between several
+modules, especially in the networking arena.  In these cases a file is created in the same
+directory, which is then included directly.
+
+
+Module test case common code
+````````````````````````````
+
+Keep common code as specific as possible within the `test/units/` directory structure. For
+example, if it's specific to testing Amazon modules, it should be in
+`test/units/modules/cloud/amazon/`. Don't import common unit test code from directories
+outside the current or parent directories.
+
+Don't import other unit tests from a unit test. Any common code should be in dedicated
+files that aren't themselves tests.
+
 
 Fixtures files
 ``````````````
 
-To mock out fetching results from devices, you can use ``fixtures`` to read in pre-generated data.
+To mock out fetching results from devices, or provide other complex datastructures that
+come from external libraries, you can use ``fixtures`` to read in pre-generated data.
 
 Text files live in ``test/units/modules/network/PLATFORM/fixtures/``
 
 Data is loaded using the ``load_fixture`` method
 
-See  `eos_banner test <https://github.com/ansible/ansible/blob/devel/test/units/modules/network/eos/test_eos_banner.py>`_ for a practical example.
+See `eos_banner test
+<https://github.com/ansible/ansible/blob/devel/test/units/modules/network/eos/test_eos_banner.py>`_
+for a practical example.
+
+If you are simulating APIs you may find that python placebo is useful.  See
+doc:`testing_units_modules` for more information.
 
-Code Coverage
-`````````````
-Most ``ansible-test`` commands allow you to collect code coverage, this is particularly useful when to indicate where to extend testing.
+
+Code Coverage For New or Updated Unit Tests
+```````````````````````````````````````````
+New code will be missing from the codecov.io coverage reports (see :doc:`testing`), so
+local reporting is needed.  Most ``ansible-test`` commands allow you to collect code
+coverage; this is particularly useful when to indicate where to extend testing.
 
 To collect coverage data add the ``--coverage`` argument to your ``ansible-test`` command line:
 
@@ -99,7 +188,21 @@
 * ``ansible-test coverage html`` - HTML report.
 * ``ansible-test coverage xml`` - XML report.
 
-To clear data between test runs, use the ``ansible-test coverage erase`` command. For a full list of features see the online help::
-
-   ansible-test coverage --help
+To clear data between test runs, use the ``ansible-test coverage erase`` command.  See
+:doc:`testing_units_running_locally` for more information about generating coverage
+reports.
+
+
+.. seealso::
+
+   :doc:`testing_units_modules`
+       Special considerations for unit testing modules
+   :doc:`testing_running_locally`
+       Running tests locally including gathering and reporting coverage data
+   `Python 3 documentation - 26.4. unittest — Unit testing framework <https://docs.python.org/3/library/unittest.html>`_
+       The documentation of the unittest framework in python 3 
+   `Python 2 documentation - 25.3. unittest — Unit testing framework <https://docs.python.org/3/library/unittest.html>`_
+       The documentation of the earliest supported unittest framework - from Python 2.6
+   `pytest: helps you write better programs <https://docs.pytest.org/en/latest/>`_
+       The documentation of pytest - the framework actually used to run Ansible unit tests
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/faq.rst ansible-2.4.2.0/docs/docsite/rst/faq.rst
--- ansible-2.4.1.0/docs/docsite/rst/faq.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/faq.rst	2017-11-29 21:10:31.000000000 +0000
@@ -362,7 +362,7 @@
 
 A steadfast rule is 'always use {{ }} except when `when:`'.
 Conditionals are always run through Jinja2 as to resolve the expression,
-so `when:`, `failed_when:` and `changed_when:` are always templated and you should avoid adding `{{}}`.
+so `when:`, `failed_when:`, and `changed_when:` are always templated and you should avoid adding `{{}}`.
 
 In most other cases you should always use the brackets, even if previously you could use variables without specifying (like `with_` clauses),
 as this made it hard to distinguish between an undefined variable and a string.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/galaxy.rst ansible-2.4.2.0/docs/docsite/rst/galaxy.rst
--- ansible-2.4.1.0/docs/docsite/rst/galaxy.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/galaxy.rst	2017-11-29 21:10:31.000000000 +0000
@@ -274,7 +274,7 @@
 Search for Roles
 ----------------
 
-Search the Galaxy database by tags, platforms, author and multiple keywords. For example:
+Search the Galaxy database by tags, platforms, author, and multiple keywords. For example:
 
 ::
 
@@ -361,7 +361,7 @@
 Authenticate with Galaxy
 ------------------------
 
-Using the ``import``, ``delete`` and ``setup`` commands to manage your roles on the Galaxy website requires authentication, and the ``login`` command
+Using the ``import``, ``delete``, and ``setup`` commands to manage your roles on the Galaxy website requires authentication, and the ``login`` command
 can be used to do just that. Before you can use the ``login`` command, you must create an account on the Galaxy website.
 
 The ``login`` command requires using your GitHub credentials. You can use your username and password, or you can create a `personal access token <https://help.github.com/articles/creating-an-access-token-for-command-line-use/>`_. If you choose to create a token, grant minimal access to the token, as it is used just to verify identify.
@@ -382,8 +382,8 @@
     Password for dsmith:
     Successfully logged into Galaxy as dsmith
 
-When you choose to use your username and password, your password is not sent to Galaxy. It is used to authenticates with GitHub and create a personal access token.
-It then sends the token to Galaxy, which in turn verifies that your identity and returns a Galaxy access token. After authentication completes the GitHub token is
+When you choose to use your username and password, your password is not sent to Galaxy. It is used to authenticate with GitHub and create a personal access token.
+It then sends the token to Galaxy, which in turn verifies your identity and returns a Galaxy access token. After authentication completes the GitHub token is
 destroyed.
 
 If you do not wish to use your GitHub password, or if you have two-factor authentication enabled with GitHub, use the *--github-token* option to pass a personal access token
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_azure.rst ansible-2.4.2.0/docs/docsite/rst/guide_azure.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_azure.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_azure.rst	2017-11-29 21:10:31.000000000 +0000
@@ -131,14 +131,14 @@
 -------------------------
 
 There are two ways to create a virtual machine, both involving the azure_rm_virtualmachine module. We can either create
-a storage account, network interface, security group and public IP address and pass the names of these objects to the
+a storage account, network interface, security group, and public IP address and pass the names of these objects to the
 module as parameters, or we can let the module do the work for us and accept the defaults it chooses.
 
 Creating Individual Components
 ..............................
 
 An Azure module is available to help you create a storage account, virtual network, subnet, network interface,
-security group and public IP. Here is a full example of creating each of these and passing the names to the
+security group, and public IP. Here is a full example of creating each of these and passing the names to the
 azure_rm_virtualmachine module at the end:
 
 .. code-block:: yaml
@@ -315,7 +315,7 @@
 NOTE: An .ini file will take precedence over environment variables.
 
 NOTE: The name of the .ini file is the basename of the inventory script (i.e. 'azure_rm') with a '.ini'
-extension. This allows you to copy, rename and customize the inventory script and have matching .ini files all in
+extension. This allows you to copy, rename, and customize the inventory script and have matching .ini files all in
 the same directory.
 
 Control grouping using the following variables defined in the environment:
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_cloudstack.rst ansible-2.4.2.0/docs/docsite/rst/guide_cloudstack.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_cloudstack.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_cloudstack.rst	2017-11-29 21:10:31.000000000 +0000
@@ -134,7 +134,7 @@
 `````````````````````
 .. versionadded:: 2.3
 
-Since Ansible 2.3 it is possible to use environment variables for domain (``CLOUDSTACK_DOMAIN``), account (``CLOUDSTACK_ACCOUNT``), project (``CLOUDSTACK_PROJECT``), VPC (``CLOUDSTACK_VPC``) and zone (``CLOUDSTACK_ZONE``). This simplifies the tasks by not repeating the arguments for every tasks.
+Since Ansible 2.3 it is possible to use environment variables for domain (``CLOUDSTACK_DOMAIN``), account (``CLOUDSTACK_ACCOUNT``), project (``CLOUDSTACK_PROJECT``), VPC (``CLOUDSTACK_VPC``), and zone (``CLOUDSTACK_ZONE``). This simplifies the tasks by not repeating the arguments for every tasks.
 
 Below you see an example how it can be used in combination with Ansible's block feature:
 
@@ -165,7 +165,7 @@
 
 .. Note:: You are still able overwrite the environment variables using the module arguments, e.g. ``zone: sf-2``
 
-.. Note:: Unlike ``CLOUDSTACK_REGION`` these additional environment variables are ingored in the CLI ``cs``.
+.. Note:: Unlike ``CLOUDSTACK_REGION`` these additional environment variables are ignored in the CLI ``cs``.
 
 Use Cases
 `````````
@@ -197,7 +197,7 @@
 
 As you can see, the public IPs for our web servers and jumphost has been assigned as variable ``public_ip`` directly in the inventory.
 
-The configure the jumphost, web servers and database servers, we use ``group_vars``. The ``group_vars`` directory contains 4 files for configuration of the groups: cloud-vm, jumphost, webserver and db-server. The cloud-vm is there for specifying the defaults of our cloud infrastructure.
+To configure the jumphost, web servers, and database servers, we use ``group_vars``. The ``group_vars`` directory contains 4 files for configuration of the groups: cloud-vm, jumphost, webserver, and db-server. The cloud-vm is there for specifying the defaults of our cloud infrastructure.
 
 .. code-block:: yaml
 
@@ -262,9 +262,9 @@
           cs_staticnat: vm="{{ inventory_hostname_short }}" ip_address="{{ public_ip }}"
           when: public_ip is defined
 
-In the above play we defined 3 tasks and use the group ``cloud-vm`` as target to handle all VMs in the cloud but instead SSH to these VMs, we use ``connetion=local`` to execute the API calls locally from our workstation.
+In the above play we defined 3 tasks and used the group ``cloud-vm`` as target to handle all VMs in the cloud but instead SSH to these VMs, we use ``connection=local`` to execute the API calls locally from our workstation.
 
-In the first task, we ensure we have a running VM created with the Debian template. If the VM is already created but stopped, it would just start it. If you like to change the offering on an existing VM, you must add ``force: yes`` to the task, which would stop the VM, change the offering and start the VM again.
+In the first task, we ensure we have a running VM created with the Debian template. If the VM is already created but stopped, it would just start it. If you like to change the offering on an existing VM, you must add ``force: yes`` to the task, which would stop the VM, change the offering, and start the VM again.
 
 In the second task we ensure the ports are opened if we give a public IP to the VM.
 
@@ -364,12 +364,12 @@
       - name: show VM IP
         debug: msg="VM {{ inventory_hostname }} {{ vm.default_ip }}"
 
-      - name: assing IP to the inventory
+      - name: assign IP to the inventory
         set_fact: ansible_ssh_host={{ vm.default_ip }}
 
       - name: waiting for SSH to come up
         wait_for: port=22 host={{ vm.default_ip }} delay=5
 
-In the first play we setup the security groups, in the second play the VMs will created be assigned to these groups. Further you see, that we assign the public IP returned from the modules to the host inventory. This is needed as we do not know the IPs we will get in advance. In a next step you would configure the DNS servers with these IPs for accassing the VMs with their DNS name.
+In the first play we setup the security groups, in the second play the VMs will created be assigned to these groups. Further you see, that we assign the public IP returned from the modules to the host inventory. This is needed as we do not know the IPs we will get in advance. In a next step you would configure the DNS servers with these IPs for accessing the VMs with their DNS name.
 
 In the last task we wait for SSH to be accessible, so any later play would be able to access the VM by SSH without failure.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_docker.rst ansible-2.4.2.0/docs/docsite/rst/guide_docker.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_docker.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_docker.rst	2017-11-29 21:10:31.000000000 +0000
@@ -8,11 +8,11 @@
         Swarm. Supports compose versions 1 and 2.
 
     docker_container
-        Manages the container lifecycle by providing the ability to create, update, stop, start and destroy a
+        Manages the container lifecycle by providing the ability to create, update, stop, start, and destroy a
         container.
 
     docker_image
-        Provides full control over images, including: build, pull, push, tag and remove.
+        Provides full control over images, including: build, pull, push, tag, and remove.
 
     docker_image_facts
         Inspects one or more images in the Docker host's image cache, providing the information as facts for making
@@ -126,7 +126,7 @@
         The maximum amount of time in seconds to wait on a response from the API.
 
     DOCKER_CERT_PATH
-        Path to the directory containing the client certificate, client key and CA certificate.
+        Path to the directory containing the client certificate, client key, and CA certificate.
 
     DOCKER_SSL_VERSION
         Provide a valid SSL version number.
@@ -205,7 +205,7 @@
         by docker-py.
 
     DOCKER_TIMEOUT:
-        The maximum amount of time in seconds to wait on a response fromm the API. Defaults to 60 seconds.
+        The maximum amount of time in seconds to wait on a response from the API. Defaults to 60 seconds.
 
     DOCKER_TLS:
         Secure the connection to the API by using TLS without verifying the authenticity of the Docker host server.
@@ -213,18 +213,18 @@
 
     DOCKER_TLS_VERIFY:
         Secure the connection to the API by using TLS and verifying the authenticity of the Docker host server.
-        Default is False
+        Defaults to False.
 
     DOCKER_TLS_HOSTNAME:
         When verifying the authenticity of the Docker Host server, provide the expected name of the server. Defaults
         to localhost.
 
     DOCKER_CERT_PATH:
-        Path to the directory containing the client certificate, client key and CA certificate.
+        Path to the directory containing the client certificate, client key, and CA certificate.
 
     DOCKER_SSL_VERSION:
         Provide a valid SSL version number. Default value determined by docker-py, which at the time of this writing
-        was 1.0
+        was 1.0.
 
 In addition to the connection variables there are a couple variables used to control the execution and output of the
 script:
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_packet.rst ansible-2.4.2.0/docs/docsite/rst/guide_packet.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_packet.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_packet.rst	2017-11-29 21:10:31.000000000 +0000
@@ -8,7 +8,7 @@
 `Packet.net <https://packet.net>`_ is a bare metal infrastructure host that's supported by Ansible (>=2.3) via a dynamic inventory script and two cloud modules. The two modules are:
 
 - packet_sshkey: adds a public SSH key from file or value to the Packet infrastructure. Every subsequently-created device will have this public key installed in .ssh/authorized_keys.
-- packet_device: manages servers on Packet. You can use this module to create, restart and delete devices.
+- packet_device: manages servers on Packet. You can use this module to create, restart, and delete devices.
 
 Note, this guide assumes you are familiar with Ansible and how it works. If you're not, have a look at their `docs <http://docs.ansible.com/>`_ before getting started.
 
@@ -183,7 +183,7 @@
 
 As with most Ansible modules, the default states of the Packet modules are idempotent, meaning the resources in your project will remain the same after re-runs of a playbook. Thus, we can keep the ``packet_sshkey`` module call in our playbook. If the public key is already in your Packet account, the call will have no effect.
 
-The second module call provisions 3 Packet Type 0 (specified using the 'plan' parameter) servers in the project identified via the 'project_id' parameter. The servers are all provisioned with CoresOS beta (the 'operating_system' parameter) and are customized with cloud-config user data passed to the 'user_data' parameter.
+The second module call provisions 3 Packet Type 0 (specified using the 'plan' parameter) servers in the project identified via the 'project_id' parameter. The servers are all provisioned with CoreOS beta (the 'operating_system' parameter) and are customized with cloud-config user data passed to the 'user_data' parameter.
 
 The ``packet_device`` module has a boolean 'wait' parameter that defaults to 'false'. If set to 'true', Ansible will wait until the GET API call for a device will contain an Internet-routeable IP address. The 'wait' parameter allows us to use the IP address of the device as soon as it's available.
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_rax.rst ansible-2.4.2.0/docs/docsite/rst/guide_rax.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_rax.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_rax.rst	2017-11-29 21:10:31.000000000 +0000
@@ -457,7 +457,7 @@
 Complete Environment
 ++++++++++++++++++++
 
-Build a complete webserver environment with servers, custom networks and load balancers, install nginx and create a custom index.html
+Build a complete webserver environment with servers, custom networks and load balancers, install nginx, and create a custom index.html.
 
 .. code-block:: yaml
    
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_rolling_upgrade.rst ansible-2.4.2.0/docs/docsite/rst/guide_rolling_upgrade.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_rolling_upgrade.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_rolling_upgrade.rst	2017-11-29 21:10:31.000000000 +0000
@@ -176,7 +176,7 @@
    {% endfor %}
 
 This loops over all of the hosts in the group called ``monitoring``, and adds an ACCEPT line for 
-each monitoring hosts' default IPV4 address to the current machine's iptables configuration, so that Nagios can monitor those hosts.
+each monitoring hosts' default IPv4 address to the current machine's iptables configuration, so that Nagios can monitor those hosts.
 
 You can learn a lot more about Jinja2 and its capabilities `here <http://jinja.pocoo.org/docs/>`_, and you 
 can read more about Ansible variables in general in the :doc:`playbooks_variables` section.
@@ -220,6 +220,11 @@
     delegate_to: "{{ item }}"
     with_items: "{{ groups.lbservers }}"
 
+
+.. note::
+   - The ``serial`` keyword forces the play to be executed in 'batches'. Each batch counts as a full play with a subselection of hosts.
+     This has some consequences on play behavior. For example, if all hosts in a batch fails, the play fails, which in turn fails the entire run. You should consider this when combining with ``max_fail_percentage``.
+
 The ``pre_tasks`` keyword just lets you list tasks to run before the roles are called. This will make more sense in a minute. If you look at the names of these tasks, you can see that we are disabling Nagios alerts and then removing the webserver that we are currently updating from the HAProxy load balancing pool.
 
 The ``delegate_to`` and ``with_items`` arguments, used together, cause Ansible to loop over each monitoring server and load balancer, and perform that operation (delegate that operation) on the monitoring or load balancing server, "on behalf" of the webserver. In programming terms, the outer loop is the list of web servers, and the inner loop is the list of monitoring servers.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/guide_vagrant.rst ansible-2.4.2.0/docs/docsite/rst/guide_vagrant.rst
--- ansible-2.4.1.0/docs/docsite/rst/guide_vagrant.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/guide_vagrant.rst	2017-11-29 21:10:31.000000000 +0000
@@ -113,7 +113,7 @@
 
 If you want to run Ansible manually, you will want to make sure to pass
 ``ansible`` or ``ansible-playbook`` commands the correct arguments, at least
-for the *username*, the *SSH private key* and the *inventory*.
+for the *username*, the *SSH private key*, and the *inventory*.
 
 Here is an example using the Vagrant global insecure key (``config.ssh.insert_key``
 must be set to ``false`` in your ``Vagrantfile``):
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_bsd.rst ansible-2.4.2.0/docs/docsite/rst/intro_bsd.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_bsd.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_bsd.rst	2017-11-29 21:10:31.000000000 +0000
@@ -66,7 +66,7 @@
 BSD Facts
 `````````
 
-Ansible gathers facts from the BSDs in a similar manner to Linux machines, but since the data, names and structures can vary for network, disks and other devices, one should expect the output to be slightly different yet still familiar to a BSD administrator.
+Ansible gathers facts from the BSDs in a similar manner to Linux machines, but since the data, names, and structures can vary for network, disks, and other devices, one should expect the output to be slightly different yet still familiar to a BSD administrator.
 
 .. _bsd_contributions:
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_dynamic_inventory.rst ansible-2.4.2.0/docs/docsite/rst/intro_dynamic_inventory.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_dynamic_inventory.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_dynamic_inventory.rst	2017-11-29 21:10:31.000000000 +0000
@@ -185,7 +185,7 @@
   ``security_group_Pete_s_Fancy_Group``
 
 Tags
-  Each instance can have a variety of key/value pairs associated with it called Tags. The most common tag key is 'Name', though anything is possible. Each key/value pair is its own group of instances, again with special characters converted to underscores, in the format ``tag_KEY_VALUE``
+  Each instance can have a variety of key/value pairs associated with it called Tags. The most common tag key is 'Name', though anything is possible. Each key/value pair is its own group of instances, again with special characters converted to underscores, in the format ``tag_KEY_VALUE``.
   e.g.
   ``tag_Name_Web`` can be used as is
   ``tag_Name_redis-master-001`` becomes ``tag_Name_redis_master_001``
@@ -265,7 +265,7 @@
 
 .. note::
 
-    An OpenStack RC file contains the environment variables required by the client tools to establish a connection with the cloud provider, such as the authentication URL, user name, password and region name. For more information on how to download, create or source an OpenStack RC file, please refer to `Set environment variables using the OpenStack RC file <http://docs.openstack.org/user-guide/common/cli_set_environment_variables_using_openstack_rc.html>`_.
+    An OpenStack RC file contains the environment variables required by the client tools to establish a connection with the cloud provider, such as the authentication URL, user name, password, and region name. For more information on how to download, create or source an OpenStack RC file, please refer to `Set environment variables using the OpenStack RC file <http://docs.openstack.org/user-guide/common/cli_set_environment_variables_using_openstack_rc.html>`_.
 
 You can confirm the file has been successfully sourced by running a simple command, such as `nova list` and ensuring it return no errors.
 
@@ -286,13 +286,13 @@
 Implicit use of inventory script
 ++++++++++++++++++++++++++++++++
 
-Download the latest version of the OpenStack dynamic inventory script, make it executable and copy it to `/etc/ansible/hosts`::
+Download the latest version of the OpenStack dynamic inventory script, make it executable, and copy it to `/etc/ansible/hosts`::
 
     wget https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/openstack.py
     chmod +x openstack.py
     sudo cp openstack.py /etc/ansible/hosts
 
-Download the sample configuration file, modify it to suit your needs and copy it to `/etc/ansible/openstack.yml`::
+Download the sample configuration file, modify it to suit your needs, and copy it to `/etc/ansible/openstack.yml`::
 
     wget https://raw.githubusercontent.com/ansible/ansible/devel/contrib/inventory/openstack.yml
     vi openstack.yml
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_installation.rst ansible-2.4.2.0/docs/docsite/rst/intro_installation.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_installation.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_installation.rst	2017-11-29 21:10:31.000000000 +0000
@@ -269,7 +269,7 @@
 
    $ sudo CFLAGS=-Qunused-arguments CPPFLAGS=-Qunused-arguments pip install ansible
 
-Readers that use virtualenv can also install Ansible under virtualenv, though we'd recommend to not worry about it and just install Ansible globally.  Do not use easy_install to install ansible directly.
+Readers that use virtualenv can also install Ansible under virtualenv, though we'd recommend to not worry about it and just install Ansible globally.  Do not use easy_install to install Ansible directly.
 
 .. _tagged_releases:
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_inventory.rst ansible-2.4.2.0/docs/docsite/rst/intro_inventory.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_inventory.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_inventory.rst	2017-11-29 21:10:31.000000000 +0000
@@ -11,7 +11,7 @@
 You can specify a different inventory file using the ``-i <path>`` option on the command line.
 
 Not only is this inventory configurable, but you can also use multiple inventory files at the same time and
-pull inventory from dynamic or cloud sources or different formats (YAML, ini, etc), as described in :doc:`intro_dynamic_inventory`.
+pull inventory from dynamic or cloud sources or different formats (YAML, ini, etc.), as described in :doc:`intro_dynamic_inventory`.
 Introduced in version 2.4, Ansible has inventory plugins to make this flexible and customizable.
 
 .. _inventoryformat:
@@ -282,7 +282,7 @@
 It is okay if these files do not exist, as this is an optional feature.
 
 As an advanced use case, you can create *directories* named after your groups or hosts, and
-Ansible will read all the files in these directories. An example with the 'raleigh' group::
+Ansible will read all the files in these directories in lexicographical order. An example with the 'raleigh' group::
 
     /etc/ansible/group_vars/raleigh/db_settings
     /etc/ansible/group_vars/raleigh/cluster_settings
@@ -319,7 +319,7 @@
 ansible_host
     The name of the host to connect to, if different from the alias you wish to give to it.
 ansible_port
-    The ssh port number, if not 22
+    The ssh port number, if not 22.
 ansible_user
     The default ssh user name to use.
 
@@ -327,7 +327,7 @@
 Specific to the SSH connection:
 
 ansible_ssh_pass
-    The ssh password to use (never store this variable in plain text; always use a vault. See :ref:`best_practices_for_variables_and_vaults`)
+    The ssh password to use (never store this variable in plain text; always use a vault. See :ref:`best_practices_for_variables_and_vaults`).
 ansible_ssh_private_key_file
     Private key file used by ssh.  Useful if using multiple keys and you don't want to use SSH agent.
 ansible_ssh_common_args
@@ -349,17 +349,17 @@
 Privilege escalation (see :doc:`Ansible Privilege Escalation<become>` for further details):
 
 ansible_become
-    Equivalent to ``ansible_sudo`` or ``ansible_su``, allows to force privilege escalation
+    Equivalent to ``ansible_sudo`` or ``ansible_su``, allows to force privilege escalation.
 ansible_become_method
-    Allows to set privilege escalation method
+    Allows to set privilege escalation method.
 ansible_become_user
-    Equivalent to ``ansible_sudo_user`` or ``ansible_su_user``, allows to set the user you become through privilege escalation
+    Equivalent to ``ansible_sudo_user`` or ``ansible_su_user``, allows to set the user you become through privilege escalation.
 ansible_become_pass
-    Equivalent to ``ansible_sudo_pass`` or ``ansible_su_pass``, allows you to set the privilege escalation password (never store this variable in plain text; always use a vault. See :ref:`best_practices_for_variables_and_vaults`)
+    Equivalent to ``ansible_sudo_pass`` or ``ansible_su_pass``, allows you to set the privilege escalation password (never store this variable in plain text; always use a vault. See :ref:`best_practices_for_variables_and_vaults`).
 ansible_become_exe
-    Equivalent to ``ansible_sudo_exe`` or ``ansible_su_exe``, allows you to set the executable for the escalation method selected
+    Equivalent to ``ansible_sudo_exe`` or ``ansible_su_exe``, allows you to set the executable for the escalation method selected.
 ansible_become_flags
-    Equivalent to ``ansible_sudo_flags`` or ``ansible_su_flags``, allows you to set the flags passed to the selected escalation method. This can be also set globally in :file:`ansible.cfg` in the ``sudo_flags`` option
+    Equivalent to ``ansible_sudo_flags`` or ``ansible_su_flags``, allows you to set the flags passed to the selected escalation method. This can be also set globally in :file:`ansible.cfg` in the ``sudo_flags`` option.
 
 Remote host environment parameters:
 
@@ -384,7 +384,7 @@
     overrides ``executable`` in :file:`ansible.cfg` which defaults to
     :command:`/bin/sh`.  You should really only change it if is not possible
     to use :command:`/bin/sh` (i.e. :command:`/bin/sh` is not installed on the target
-    machine or cannot be run from sudo.).
+    machine or cannot be run from sudo).
 
 Examples from an Ansible-INI host file::
 
@@ -449,7 +449,7 @@
    :doc:`intro_adhoc`
        Examples of basic commands
    :doc:`playbooks`
-       Learning Ansible's configuration, deployment, and orchestration language.
+       Learning Ansible's configuration, deployment, and orchestration language
    `Mailing List <http://groups.google.com/group/ansible-project>`_
        Questions? Help? Ideas?  Stop by the list on Google Groups
    `irc.freenode.net <http://irc.freenode.net>`_
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_networking.rst ansible-2.4.2.0/docs/docsite/rst/intro_networking.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_networking.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_networking.rst	2017-11-29 21:10:31.000000000 +0000
@@ -216,5 +216,5 @@
 
 The waitfor argument must always start with result and then the
 command index in [], where 0 is the first command in the commands list,
-1 is the second command, 2 is the third and so on.
+1 is the second command, 2 is the third, and so on.
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_patterns.rst ansible-2.4.2.0/docs/docsite/rst/intro_patterns.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_patterns.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_patterns.rst	2017-11-29 21:10:31.000000000 +0000
@@ -58,7 +58,7 @@
 
     webservers:!{{excluded}}:&{{required}}
 
-You also don't have to manage by strictly defined groups.  Individual host names, IPs and groups, can also be referenced using
+You also don't have to manage by strictly defined groups.  Individual host names, IPs, and groups, can also be referenced using
 wildcards
 
 .. code-block:: none
diff -Nru ansible-2.4.1.0/docs/docsite/rst/intro_windows.rst ansible-2.4.2.0/docs/docsite/rst/intro_windows.rst
--- ansible-2.4.1.0/docs/docsite/rst/intro_windows.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/intro_windows.rst	2017-11-29 21:10:31.000000000 +0000
@@ -59,7 +59,7 @@
     # https://github.com/Microsoft/BashOnWindows/issues/816#issuecomment-301216901 for details
     source ~/.profile
 
-After you've successfully run these commands, you can start to create your inventory, write example playbooks and start targeting systems using the plethora of available Windows modules.
+After you've successfully run these commands, you can start to create your inventory, write example playbooks, and start targeting systems using the plethora of available Windows modules.
 
 If you want to run Ansible from source for development purposes, simply uninstall the pip-installed version (which will leave all the necessary dependencies behind), then clone the Ansible source, and run the hacking script to configure it to run from source::
 
@@ -94,7 +94,7 @@
 Certificate
 +++++++++++
 
-Certificate authentication is similar to SSH where a certificate is assigned to a local user and instead of using a password to authenticate a certificate is used instead.
+Certificate authentication is similar to SSH where a certificate is assigned to a local user and instead of using a password to authenticate a certificate is used.
 
 
 Kerberos
@@ -142,7 +142,7 @@
 Configuring Kerberos
 --------------------
 
-Edit your /etc/krb5.conf (which should be installed as a result of installing packages above) and add the following information for each domain you need to connect to:
+Edit your `/etc/krb5.conf` (which should be installed as a result of installing packages above) and add the following information for each domain you need to connect to:
 
 In the section that starts with
 
@@ -204,13 +204,13 @@
 
 Ensure that forward and reverse DNS lookups are working properly on your domain.
 
-To test this, ping the windows host you want to control by name then use the ip address returned with nslookup.  You should get the same name back from DNS when you use nslookup on the ip address.  
+To test this, ping the Windows host you want to control by name then use the ip address returned with nslookup.  You should get the same name back from DNS when you use nslookup on the ip address.  
 
 If you get different hostnames back than the name you originally pinged, speak to your active directory administrator and get them to check that DNS Scavenging is enabled and that DNS and DHCP are updating each other.
 
 Ensure that the Ansible controller has a properly configured computer account in the domain.
 
-Check your Ansible controller's clock is synchronised with your domain controller.  Kerberos is time sensitive and a little clock drift can cause tickets not be granted.
+Check your Ansible controller's clock is synchronised with your domain controller.  Kerberos is time sensitive and a little clock drift can cause tickets not to be granted.
 
 Check you are using the real fully qualified domain name for the domain.  Sometimes domains are commonly known to users by aliases.  To check this run:
 
@@ -242,7 +242,7 @@
 CredSSP and TLS 1.2
 -------------------
 
-CredSSP requires the remote host to have TLS 1.2 configured or else the connection will fail. TLS 1.2 is installed by default from Server 2012 and Windows 8 onwards. For Server 2008, 2008 R2 and Windows 7 you can add TLS 1.2 support by:
+CredSSP requires the remote host to have TLS 1.2 configured or else the connection will fail. TLS 1.2 is installed by default from Server 2012 and Windows 8 onward. For Server 2008, 2008 R2, and Windows 7 you can add TLS 1.2 support by:
 
 * Installing the `TLS 1.2 update from Microsoft <https://support.microsoft.com/en-us/help/3080079/update-to-add-rds-support-for-tls-1.1-and-tls-1.2-in-windows-7-or-windows-server-2008-r2>`_
 * Adding the TLS 1.2 registry keys as shown on this `page <https://technet.microsoft.com/en-us/library/dn786418.aspx#BKMK_SchannelTR_TLS12>`_
@@ -255,7 +255,7 @@
 Inventory
 `````````
 
-Ansible's windows support relies on a few standard variables to indicate the username, password, and connection type (windows) of the remote hosts.  These variables are most easily set up in inventory.  This is used instead of SSH-keys or passwords as normally fed into Ansible::
+Ansible's Windows support relies on a few standard variables to indicate the username, password, and connection type (Windows) of the remote hosts.  These variables are most easily set up in inventory.  This is used instead of SSH-keys or passwords as normally fed into Ansible::
 
     [windows]
     winserver1.example.com
@@ -311,7 +311,7 @@
 Windows System Prep
 ```````````````````
 
-In order for Ansible to manage your windows machines, you will have to enable and configure PowerShell remoting.
+In order for Ansible to manage your Windows machines, you will have to enable and configure PowerShell remoting.
 
 To automate the setup of WinRM, you can run the `examples/scripts/ConfigureRemotingForAnsible.ps1 <https://github.com/ansible/ansible/blob/devel/examples/scripts/ConfigureRemotingForAnsible.ps1>`_ script on the remote machine in a PowerShell console as an administrator.
 
@@ -340,7 +340,7 @@
    Management Framework 3.0, it may be necessary to install this
    hotfix http://support.microsoft.com/kb/2842230 to avoid receiving
    out of memory and stack overflow exceptions.  Newly-installed Server 2008
-   R2 systems which are not fully up to date with windows updates are known
+   R2 systems which are not fully up to date with Windows updates are known
    to have this issue.
 
    Windows 8.1 and Server 2012 R2 are not affected by this issue as they
@@ -386,9 +386,9 @@
 * template (also: win_template)
 * wait_for_connection
 
-Some modules can be utilised in playbooks that target windows by delegating to localhost, depending on what you are
+Some modules can be utilised in playbooks that target Windows by delegating to localhost, depending on what you are
 attempting to achieve.  For example, ``assemble`` can be used to create a file on your ansible controller that is then 
-sent to your windows targets using ``win_copy``.
+sent to your Windows targets using ``win_copy``.
 
 In many cases, there is no need to use or write an Ansible module. In particular, the ``script`` module can be used to run arbitrary PowerShell scripts, allowing Windows administrators familiar with PowerShell a very native way to do things, as in the following playbook::
 
@@ -425,7 +425,7 @@
 
     # code goes here, reading in stdin as JSON and outputting JSON
 
-The above magic is necessary to tell Ansible to mix in some common code and also know how to push modules out.  The common code contains some nice wrappers around working with hash data structures and emitting JSON results, and possibly a few more useful things.  Regular Ansible has this same concept for reusing Python code - this is just the windows equivalent.
+The above magic is necessary to tell Ansible to mix in some common code and also know how to push modules out.  The common code contains some nice wrappers around working with hash data structures and emitting JSON results, and possibly a few more useful things.  Regular Ansible has this same concept for reusing Python code - this is just the Windows equivalent.
 
 What modules you see in ``windows/`` are just a start.  Additional modules may be submitted as pull requests to github.
 
@@ -434,7 +434,7 @@
 Windows Facts
 `````````````
 
-Just as with Linux/Unix, facts can be gathered for windows hosts, which will return things such as the operating system version.  To see what variables are available about a windows host, run the following::
+Just as with Linux/Unix, facts can be gathered for Windows hosts, which will return things such as the operating system version.  To see what variables are available about a Windows host, run the following::
 
     ansible winhost.example.com -m setup
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/playbooks_filters.rst ansible-2.4.2.0/docs/docsite/rst/playbooks_filters.rst
--- ansible-2.4.1.0/docs/docsite/rst/playbooks_filters.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/playbooks_filters.rst	2017-11-29 21:10:31.000000000 +0000
@@ -695,11 +695,11 @@
 
 To use one value on true and another on false (new in version 1.9)::
 
-   {{ (name == "John") | ternary('Mr','Ms') }}
+    {{ (name == "John") | ternary('Mr','Ms') }}
 
 To concatenate a list into a string::
 
-   {{ list | join(" ") }}
+    {{ list | join(" ") }}
 
 To get the last name of a file path, like 'foo.txt' out of '/etc/asdf/foo.txt'::
 
@@ -735,7 +735,7 @@
 
 To get the real path of a link (new in version 1.8)::
 
-   {{ path | realpath }}
+    {{ path | realpath }}
 
 To get the relative path of a link, from a start point (new in version 1.7)::
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/playbooks_reuse_roles.rst ansible-2.4.2.0/docs/docsite/rst/playbooks_reuse_roles.rst
--- ansible-2.4.1.0/docs/docsite/rst/playbooks_reuse_roles.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/playbooks_reuse_roles.rst	2017-11-29 21:10:31.000000000 +0000
@@ -198,7 +198,7 @@
 1. Pass different parameters in each role definition.
 2. Add ``allow_duplicates: true`` to the ``meta/main.yml`` file for the role.
 
-Example 1 - passing different paramters::
+Example 1 - passing different parameters::
 
     ---
     - hosts: webservers
diff -Nru ansible-2.4.1.0/docs/docsite/rst/playbooks_reuse.rst ansible-2.4.2.0/docs/docsite/rst/playbooks_reuse.rst
--- ansible-2.4.1.0/docs/docsite/rst/playbooks_reuse.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/playbooks_reuse.rst	2017-11-29 21:10:31.000000000 +0000
@@ -52,8 +52,8 @@
 
 Using ``include*`` does have some limitations when compared to ``import*`` statements:
 
-* Tags which only exist inside a dynamic include will not show up in --list-tags output.
-* Tasks which only exist inside a dynamic include will not show up in --list-tasks output.
+* Tags which only exist inside a dynamic include will not show up in ``--list-tags`` output.
+* Tasks which only exist inside a dynamic include will not show up in ``--list-tasks`` output.
 * You cannot use ``notify`` to trigger a handler name which comes from inside a dynamic include (see note below).
 * You cannot use ``--start-at-task`` to begin execution at a task inside a dynamic include.
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/playbooks_variables.rst ansible-2.4.2.0/docs/docsite/rst/playbooks_variables.rst
--- ansible-2.4.1.0/docs/docsite/rst/playbooks_variables.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/playbooks_variables.rst	2017-11-29 21:10:31.000000000 +0000
@@ -836,13 +836,16 @@
 
   * role defaults [1]_
   * inventory file or script group vars [2]_
-  * inventory group_vars/all
-  * playbook group_vars/all
-  * inventory group_vars/*
-  * playbook group_vars/*
+  * inventory group_vars/all [3]_
+  * playbook group_vars/all [3]_
+  * inventory group_vars/* [3]_
+  * playbook group_vars/* [3]_
   * inventory file or script host vars [2]_
   * inventory host_vars/*
   * playbook host_vars/*
+  * host facts / cached set_facts [4]_
+  * inventory host_vars/* [3]_
+  * playbook host_vars/* [3]_
   * host facts
   * play vars
   * play vars_prompt
@@ -862,6 +865,9 @@
 
 .. [1] Tasks in each role will see their own role's defaults. Tasks defined outside of a role will see the last role's defaults.
 .. [2] Variables defined in inventory file or provided by dynamic inventory.
+.. [3] Includes vars added by 'vars plugins' as well as host_vars and group_vars which are added by the default vars plugin shipped with Ansible.
+.. [4] When created with set_facts's cacheable option, variables will have the high precedence in the play,
+       but will be the same as a host facts precedence when they come from the cache.
 
 .. note:: Within any section, redefining a var will overwrite the previous instance.
           If multiple groups have the same variable, the last one loaded wins.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/playbooks_vault.rst ansible-2.4.2.0/docs/docsite/rst/playbooks_vault.rst
--- ansible-2.4.1.0/docs/docsite/rst/playbooks_vault.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/playbooks_vault.rst	2017-11-29 21:10:31.000000000 +0000
@@ -3,9 +3,9 @@
 
 .. contents:: Topics
 
-New in Ansible 1.5, "Vault" is a feature of ansible that allows keeping sensitive data such as passwords or keys in encrypted files, rather than as plaintext in your playbooks or roles. These vault files can then be distributed or placed in source control.
+Added in Ansible 1.5, "Vault" is a feature of ansible that allows keeping sensitive data such as passwords or keys in encrypted files, rather than as plaintext in your playbooks or roles. These vault files can then be distributed or placed in source control.
 
-To enable this feature, a command line tool, `ansible-vault` is used to edit files, and a command line flag `--ask-vault-pass` or `--vault-password-file` is used. Alternately, you may specify the location of a password file or command Ansible to always prompt for the password in your ansible.cfg file. These options require no command line flag usage.
+To enable this feature, a command line tool, :ref:`ansible-vault` is used to edit files, and a command line flag :option:`--ask-vault-pass <ansible-vault --ask-vault-pass>` or :option:`--vault-password-file <ansible-vault --vault-password-file>` is used. You can also modify your ``ansible.cfg`` file to specify the location of a password file or configure Ansible to always prompt for the password. These options require no command line flag usage.
 
 For best practices advice, refer to :ref:`best_practices_for_variables_and_vaults`.
 
@@ -35,7 +35,7 @@
 
 This is something you may wish to do if using Ansible from a continuous integration system like Jenkins.
 
-(The `--vault-password-file` option can also be used with the :ref:`ansible-pull` command if you wish, though this would require distributing the keys to your nodes, so understand the implications -- vault is more intended for push mode).
+The :option:`--vault-password-file <ansible-pull --vault-password-file>` option can also be used with the :ref:`ansible-pull` command if you wish, though this would require distributing the keys to your nodes, so understand the implications -- vault is more intended for push mode.
 
 
 .. _single_encrypted_variable:
@@ -66,6 +66,6 @@
 ````````````````````
 
 This command will output a string in the above format ready to be included in a YAML file.
-The string to encrypt can be provided via stdin, command line args, or via an interactive prompt.
+The string to encrypt can be provided via stdin, command line arguments, or via an interactive prompt.
 
 See :ref:`encrypt_string_for_use_in_yaml`.
diff -Nru ansible-2.4.1.0/docs/docsite/rst/porting_guide_2.0.rst ansible-2.4.2.0/docs/docsite/rst/porting_guide_2.0.rst
--- ansible-2.4.1.0/docs/docsite/rst/porting_guide_2.0.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/porting_guide_2.0.rst	2017-11-29 21:10:31.000000000 +0000
@@ -171,7 +171,7 @@
 
     with_items: myvar_{{rest_of_name}}
 
-  This worked 'by accident' as the errors were retemplated and ended up resolving the variable, it was never intended as valid syntax and now properly returns an error, use the following instead.::
+  This worked 'by accident' as the errors were retemplated and ended up resolving the variable, it was never intended as valid syntax and now properly returns an error, use the following instead::
 
     hostvars[inventory_hostname]['myvar_' + rest_of_name]
 
@@ -287,7 +287,7 @@
 
 You may find the following tips useful:
 
-* Check whether the ansible-2.0 class(es) are available and if they are missing (ansible-1.9.x) mimic them with the needed methods (e.g. ``__init__``)
+* Check whether the ansible-2.0 class(es) are available and if they are missing (ansible-1.9.x) mimic them with the needed methods (e.g. ``__init__``).
 
 * When ansible-2.0 python modules are imported, and they fail (ansible-1.9.x), catch the ``ImportError`` exception and perform the equivalent imports for ansible-1.9.x. With possible translations (e.g. importing specific methods).
 
@@ -297,7 +297,7 @@
 
 * When doing plugin development, it is very useful to have the ``warning()`` method during development, but it is also important to emit warnings for deadends (cases that you expect should never be triggered) or corner cases (e.g. cases where you expect misconfigurations).
 
-* It helps to look at other plugins in ansible-1.9.x and ansible-2.0 to understand how the API works and what modules, classes and methods are available.
+* It helps to look at other plugins in ansible-1.9.x and ansible-2.0 to understand how the API works and what modules, classes, and methods are available.
 
 
 Lookup plugins
diff -Nru ansible-2.4.1.0/docs/docsite/rst/porting_guide_2.4.rst ansible-2.4.2.0/docs/docsite/rst/porting_guide_2.4.rst
--- ansible-2.4.1.0/docs/docsite/rst/porting_guide_2.4.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/porting_guide_2.4.rst	2017-11-29 21:10:31.000000000 +0000
@@ -131,6 +131,57 @@
 * Any callbacks inheriting from other callbacks might need to also be updated to contain the same documented options
   as the parent or the options won't be available.  This is noted in the developer guide.
 
+Template lookup plugin: Escaping Strings
+----------------------------------------
+
+Prior to Ansible 2.4, backslashes in strings passed to the template lookup plugin would be escaped
+automatically. In 2.4, users are responsible for escaping backslashes themselves. This change
+brings the template lookup plugin inline with the template module so that the same backslash
+escaping rules apply to both.
+
+If you have a template lookup like this::
+
+    - debug:
+        msg: '{{ lookup("template", "template.j2") }}'
+
+**OLD** In Ansible 2.3 (and earlier) :file:`template.j2` would look like this:
+
+.. code-block:: jinja
+
+    {{ "name surname" | regex_replace("^[^\s]+\s+(.*)", "\1") }}
+
+**NEW** In Ansible 2.4 it should be changed to look like this:
+
+.. code-block:: jinja
+
+    {{ "name surname" | regex_replace("^[^\\s]+\\s+(.*)", "\\1") }}
+
+Tests
+=====
+
+Tests succeeded/failed
+-----------------------
+
+Prior to Ansible version 2.4, a task return code of ``rc`` would override a return code of ``failed``. In version 2.4,  both ``rc`` and ``failed`` are used to calculate the state of the task. Because of this, test plugins ``succeeded``/``failed``` have also been changed. This means that overriding a task failure with ``failed_when: no`` will result in ``succeeded``/``failed`` returning ``True``/``False``. For example:
+
+    - command: /bin/false
+      register: result
+      failed_when: no
+
+    - debug:
+        msg: 'This is printed on 2.3'
+      when: result|failed
+
+    - debug:
+        msg: 'This is printed on 2.4'
+      when: result|succeeded
+
+    - debug:
+        msg: 'This is always printed'
+      when: result.rc != 0
+
+As we can see from the example above, in Ansible 2.3 ``succeeded``/``failed`` only checked the value of ``rc``.
+
 Networking
 ==========
 
diff -Nru ansible-2.4.1.0/docs/docsite/rst/release_and_maintenance.rst ansible-2.4.2.0/docs/docsite/rst/release_and_maintenance.rst
--- ansible-2.4.1.0/docs/docsite/rst/release_and_maintenance.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/release_and_maintenance.rst	2017-11-29 21:10:31.000000000 +0000
@@ -4,7 +4,7 @@
 .. contents:: Topics
    :local:
 
-.. _schedule:
+.. _release_cycle:
 
 Release cycle
 `````````````
@@ -13,15 +13,18 @@
 This cycle can be extended in order to allow for larger changes to be properly
 implemented and tested before a new release is made available.
 
-Ansible supports the two most recent major stable releases.
-For more information, read about the
-`development and stable version maintenance workflow`_.
+Ansible has a graduated support structure that extends to three major releases.
+For more information, read about the `development and stable version maintenance workflow`_ or see
+the chart in :ref:`schedule` for the degrees to which current releases are supported.
+
+.. note:: Support for three major releases began with Ansible-2.4. Ansible-2.3 and older versions
+    are only supported for two releases.
 
 If you are using a release of Ansible that is no longer supported, we strongly
 encourage you to upgrade as soon as possible in order to benefit from the
 latest features and security fixes.
 
-Older unsupported versions of Ansible can contain unfixed security
+Older, unsupported versions of Ansible can contain unfixed security
 vulnerabilities (*CVE*).
 
 You can refer to the `porting guide`_ for tips on updating your Ansible
@@ -29,31 +32,30 @@
 
 .. _porting guide: https://docs.ansible.com/ansible/porting_guide_2.0.html
 
+.. _release_schedule:
+
 Release status
 ``````````````
 
-+-----------------+----------------------------+----------------------------------------+
-| Ansible Release | Latest Version             | Status                                 |
-+=================+============================+========================================+
-| devel           | `2.5`_ (unreleased, trunk) | In development                         |
-+-----------------+----------------------------+----------------------------------------+
-| 2.4             | `2.4.1`_ (2017-10-25)      | Supported (bug **and** security fixes) |
-+-----------------+----------------------------+----------------------------------------+
-| 2.3             | `2.3.2`_ (2017-08-08)      | Supported (bug **and** security fixes) |
-+-----------------+----------------------------+----------------------------------------+
-| 2.2             | `2.2.3`_ (2017-05-09)      | Supported (**only** security fixes)    |
-+-----------------+----------------------------+----------------------------------------+
-| 2.1             | `2.1.6`_ (2017-06-01)      | Unsupported (end of life)              |
-+-----------------+----------------------------+----------------------------------------+
-| 2.0             | `2.0.2`_ (2016-04-19)      | Unsupported (end of life)              |
-+-----------------+----------------------------+----------------------------------------+
-| 1.9             | `1.9.6`_ (2016-04-15)      | Unsupported (end of life)              |
-+-----------------+----------------------------+----------------------------------------+
-| <1.9            | n/a                        | Unsupported (end of life)              |
-+-----------------+----------------------------+----------------------------------------+
+===============   ==========================   =================================================
+Ansible Release   Latest Version               Status
+===============   ==========================   =================================================
+devel             `2.5`_ (unreleased, trunk)   In development
+2.4               `2.4.2`_ (2017-11-29)        Supported (security **and** general bug fixes)
+2.3               `2.3.2`_ (2017-08-08)        Supported (security **and** critical bug fixes)
+2.2               `2.2.3`_ (2017-05-09)        Unsupported (end of life)
+2.1               `2.1.6`_ (2017-06-01)        Unsupported (end of life)
+2.0               `2.0.2`_ (2016-04-19)        Unsupported (end of life)
+1.9               `1.9.6`_ (2016-04-15)        Unsupported (end of life)
+<1.9              n/a                          Unsupported (end of life)
+===============   ==========================   =================================================
+
+.. note:: Starting with Ansible-2.4, support lasts for 3 releases.  Thus Ansible-2.4 will receive
+    security and general bug fixes when it is first released, security and critical bug fixes when
+    2.5 is released, and **only** security fixes once 2.6 is released.
 
 .. _2.5: https://github.com/ansible/ansible/blob/devel/CHANGELOG.md
-.. _2.4.1: https://github.com/ansible/ansible/blob/stable-2.4/CHANGELOG.md
+.. _2.4.2: https://github.com/ansible/ansible/blob/stable-2.4/CHANGELOG.md
 .. _2.3.2: https://github.com/ansible/ansible/blob/stable-2.3/CHANGELOG.md
 .. _2.2.3: https://github.com/ansible/ansible/blob/stable-2.2/CHANGELOG.md
 .. _2.1.6: https://github.com/ansible/ansible/blob/stable-2.1/CHANGELOG.md
@@ -63,18 +65,23 @@
 .. _support_life:
 .. _methods:
 
+
 Development and stable version maintenance workflow
 ```````````````````````````````````````````````````
 
 The Ansible community develops and maintains Ansible on GitHub_.
 
-New modules, plugins, features and bugfixes will always be integrated in what
-will become the next major version of Ansible.
-This work is tracked on the ``devel`` git branch.
-
-Ansible provides bugfixes and security improvements for the most recent major
-release while the previous major release will only receive security patches.
-This work is tracked on the ``stable-<version>`` git branches.
+New modules, plugins, features, and bugfixes will always be integrated in what will become the next
+major version of Ansible.  This work is tracked on the ``devel`` git branch.
+
+Ansible provides bugfixes and security improvements for the most recent major release. The previous
+major release will only receive fixes for security issues and critical bugs. Ansible only applies
+security fixes to releases which are two releases old. This work is tracked on the
+``stable-<version>`` git branches.
+
+.. note:: Support for three major releases began with Ansible-2.4. Ansible-2.3 and older versions
+    are only supported for two releases with the first stage including both security and general bug
+    fixes while the second stage includes security and critical bug fixes.
 
 The fixes that land in supported stable branches will eventually be released
 as a new version when necessary.
@@ -88,6 +95,7 @@
 .. _GitHub: https://github.com/ansible/ansible
 .. _changelog: https://github.com/ansible/ansible/blob/devel/CHANGELOG.md
 
+
 Release candidates
 ~~~~~~~~~~~~~~~~~~
 
@@ -111,7 +119,7 @@
 bugs that the Ansible core maintainers consider should be fixed before the
 final release.
 
-.. _freezing:
+.. _release_freezing:
 
 Feature freeze
 ~~~~~~~~~~~~~~
diff -Nru ansible-2.4.1.0/docs/docsite/rst/vault.rst ansible-2.4.2.0/docs/docsite/rst/vault.rst
--- ansible-2.4.1.0/docs/docsite/rst/vault.rst	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/docsite/rst/vault.rst	2017-11-29 21:10:31.000000000 +0000
@@ -14,12 +14,12 @@
 What Can Be Encrypted With Vault
 ````````````````````````````````
 
-The vault feature can encrypt any structured data file used by Ansible.  This can include "group_vars/" or "host_vars/" inventory variables, variables loaded by "include_vars" or "vars_files", or variable files passed on the ansible-playbook command line with "-e @file.yml" or "-e @file.json".  Role variables and defaults are also included!
+The vault feature can encrypt any structured data file used by Ansible.  This can include "group_vars/" or "host_vars/" inventory variables, variables loaded by "include_vars" or "vars_files", or variable files passed on the ansible-playbook command line with ``-e @file.yml`` or ``-e @file.json``.  Role variables and defaults are also included.
 
-Ansible tasks, handlers, and so on are also data so these can be encrypted with vault as well. To hide the names of variables that you're using, you can encrypt the task files in their entirety. However, that might be a little too much and could annoy your coworkers :)
+Ansible tasks, handlers, and so on are also data so these can be encrypted with vault as well. To hide the names of variables that you're using, you can encrypt the task files in their entirety.
 
 The vault feature can also encrypt arbitrary files, even binary files.  If a vault-encrypted file is
-given as the 'src' argument to the :ref:`copy <copy>`, :ref:`template <template>`,
+given as the ``src`` argument to the :ref:`copy <copy>`, :ref:`template <template>`,
 :ref:`unarchive <unarchive>`, :ref:`script <script>` or :ref:`assemble <assemble>` modules, the file will be placed at the destination on the target host decrypted (assuming a valid vault password is supplied when running the play).
 
 As of version 2.3, Ansible also supports encrypting single values inside a YAML file, using the `!vault` tag to let YAML and Ansible know it uses special processing. This feature is covered in more details below.
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible.1 ansible-2.4.2.0/docs/man/man1/ansible.1
--- ansible-2.4.1.0/docs/man/man1/ansible.1	2017-10-26 05:56:40.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible.1	2017-11-29 21:11:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -204,7 +204,7 @@
 .PP
 \fB\-i\fR, \fB\-\-inventory\fR, \fB\-\-inventory\-file\fR
 .RS 4
-specify inventory host path (default=) or comma separated host list\&. \-\-inventory\-file is deprecated
+specify inventory host path or comma separated host list\&. \-\-inventory\-file is deprecated
 .RE
 .PP
 \fB\-k\fR, \fB\-\-ask\-pass\fR
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible.1.asciidoc.in ansible-2.4.2.0/docs/man/man1/ansible.1.asciidoc.in
--- ansible-2.4.1.0/docs/man/man1/ansible.1.asciidoc.in	2017-10-26 05:56:29.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible.1.asciidoc.in	2017-11-29 21:10:58.000000000 +0000
@@ -161,7 +161,7 @@
 
 *-i*, *--inventory*, *--inventory-file*::
 
-specify inventory host path (default=[[u'/etc/ansible/hosts']]) or comma separated host list. --inventory-file is deprecated
+specify inventory host path or comma separated host list. --inventory-file is deprecated
 
 *-k*, *--ask-pass*::
 
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-config.1 ansible-2.4.2.0/docs/man/man1/ansible-config.1
--- ansible-2.4.1.0/docs/man/man1/ansible-config.1	2017-10-26 05:56:30.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-config.1	2017-11-29 21:10:59.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-config
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-CONFIG" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-CONFIG" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-console.1 ansible-2.4.2.0/docs/man/man1/ansible-console.1
--- ansible-2.4.1.0/docs/man/man1/ansible-console.1	2017-10-26 05:56:32.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-console.1	2017-11-29 21:11:00.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-console
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-CONSOLE" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-CONSOLE" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -189,7 +189,7 @@
 .PP
 \fB\-i\fR, \fB\-\-inventory\fR, \fB\-\-inventory\-file\fR
 .RS 4
-specify inventory host path (default=) or comma separated host list\&. \-\-inventory\-file is deprecated
+specify inventory host path or comma separated host list\&. \-\-inventory\-file is deprecated
 .RE
 .PP
 \fB\-k\fR, \fB\-\-ask\-pass\fR
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-console.1.asciidoc.in ansible-2.4.2.0/docs/man/man1/ansible-console.1.asciidoc.in
--- ansible-2.4.1.0/docs/man/man1/ansible-console.1.asciidoc.in	2017-10-26 05:56:29.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-console.1.asciidoc.in	2017-11-29 21:10:58.000000000 +0000
@@ -148,7 +148,7 @@
 
 *-i*, *--inventory*, *--inventory-file*::
 
-specify inventory host path (default=[[u'/etc/ansible/hosts']]) or comma separated host list. --inventory-file is deprecated
+specify inventory host path or comma separated host list. --inventory-file is deprecated
 
 *-k*, *--ask-pass*::
 
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-doc.1 ansible-2.4.2.0/docs/man/man1/ansible-doc.1
--- ansible-2.4.1.0/docs/man/man1/ansible-doc.1	2017-10-26 05:56:33.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-doc.1	2017-11-29 21:11:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-doc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-DOC" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-DOC" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-galaxy.1 ansible-2.4.2.0/docs/man/man1/ansible-galaxy.1
--- ansible-2.4.1.0/docs/man/man1/ansible-galaxy.1	2017-10-26 05:56:34.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-galaxy.1	2017-11-29 21:11:01.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-galaxy
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-GALAXY" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-GALAXY" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-inventory.1 ansible-2.4.2.0/docs/man/man1/ansible-inventory.1
--- ansible-2.4.1.0/docs/man/man1/ansible-inventory.1	2017-10-26 05:56:35.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-inventory.1	2017-11-29 21:11:02.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-inventory
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-INVENTORY" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-INVENTORY" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -99,7 +99,7 @@
 .PP
 \fB\-i\fR, \fB\-\-inventory\fR, \fB\-\-inventory\-file\fR
 .RS 4
-specify inventory host path (default=) or comma separated host list\&. \-\-inventory\-file is deprecated
+specify inventory host path or comma separated host list\&. \-\-inventory\-file is deprecated
 .RE
 .PP
 \fB\-l\fR \fISUBSET\fR, \fB\-\-limit\fR \fISUBSET\fR
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-inventory.1.asciidoc.in ansible-2.4.2.0/docs/man/man1/ansible-inventory.1.asciidoc.in
--- ansible-2.4.1.0/docs/man/man1/ansible-inventory.1.asciidoc.in	2017-10-26 05:56:29.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-inventory.1.asciidoc.in	2017-11-29 21:10:58.000000000 +0000
@@ -75,7 +75,7 @@
 
 *-i*, *--inventory*, *--inventory-file*::
 
-specify inventory host path (default=[[u'/etc/ansible/hosts']]) or comma separated host list. --inventory-file is deprecated
+specify inventory host path or comma separated host list. --inventory-file is deprecated
 
 *-l* 'SUBSET', *--limit* 'SUBSET'::
 
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-playbook.1 ansible-2.4.2.0/docs/man/man1/ansible-playbook.1
--- ansible-2.4.1.0/docs/man/man1/ansible-playbook.1	2017-10-26 05:56:36.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-playbook.1	2017-11-29 21:11:03.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-playbook
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-PLAYBOOK" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-PLAYBOOK" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -224,7 +224,7 @@
 .PP
 \fB\-i\fR, \fB\-\-inventory\fR, \fB\-\-inventory\-file\fR
 .RS 4
-specify inventory host path (default=) or comma separated host list\&. \-\-inventory\-file is deprecated
+specify inventory host path or comma separated host list\&. \-\-inventory\-file is deprecated
 .RE
 .PP
 \fB\-k\fR, \fB\-\-ask\-pass\fR
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-playbook.1.asciidoc.in ansible-2.4.2.0/docs/man/man1/ansible-playbook.1.asciidoc.in
--- ansible-2.4.1.0/docs/man/man1/ansible-playbook.1.asciidoc.in	2017-10-26 05:56:29.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-playbook.1.asciidoc.in	2017-11-29 21:10:59.000000000 +0000
@@ -178,7 +178,7 @@
 
 *-i*, *--inventory*, *--inventory-file*::
 
-specify inventory host path (default=[[u'/etc/ansible/hosts']]) or comma separated host list. --inventory-file is deprecated
+specify inventory host path or comma separated host list. --inventory-file is deprecated
 
 *-k*, *--ask-pass*::
 
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-pull.1 ansible-2.4.2.0/docs/man/man1/ansible-pull.1
--- ansible-2.4.1.0/docs/man/man1/ansible-pull.1	2017-10-26 05:56:38.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-pull.1	2017-11-29 21:11:04.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-pull
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-PULL" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-PULL" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -201,7 +201,7 @@
 .PP
 \fB\-i\fR, \fB\-\-inventory\fR, \fB\-\-inventory\-file\fR
 .RS 4
-specify inventory host path (default=) or comma separated host list\&. \-\-inventory\-file is deprecated
+specify inventory host path or comma separated host list\&. \-\-inventory\-file is deprecated
 .RE
 .PP
 \fB\-k\fR, \fB\-\-ask\-pass\fR
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-pull.1.asciidoc.in ansible-2.4.2.0/docs/man/man1/ansible-pull.1.asciidoc.in
--- ansible-2.4.1.0/docs/man/man1/ansible-pull.1.asciidoc.in	2017-10-26 05:56:29.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-pull.1.asciidoc.in	2017-11-29 21:10:58.000000000 +0000
@@ -170,7 +170,7 @@
 
 *-i*, *--inventory*, *--inventory-file*::
 
-specify inventory host path (default=[[u'/etc/ansible/hosts']]) or comma separated host list. --inventory-file is deprecated
+specify inventory host path or comma separated host list. --inventory-file is deprecated
 
 *-k*, *--ask-pass*::
 
diff -Nru ansible-2.4.1.0/docs/man/man1/ansible-vault.1 ansible-2.4.2.0/docs/man/man1/ansible-vault.1
--- ansible-2.4.1.0/docs/man/man1/ansible-vault.1	2017-10-26 05:56:39.000000000 +0000
+++ ansible-2.4.2.0/docs/man/man1/ansible-vault.1	2017-11-29 21:11:05.000000000 +0000
@@ -2,12 +2,12 @@
 .\"     Title: ansible-vault
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 10/26/2017
+.\"      Date: 11/29/2017
 .\"    Manual: System administration commands
-.\"    Source: Ansible 2.4.1.0
+.\"    Source: Ansible 2.4.2.0
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-VAULT" "1" "10/26/2017" "Ansible 2\&.4\&.1\&.0" "System administration commands"
+.TH "ANSIBLE\-VAULT" "1" "11/29/2017" "Ansible 2\&.4\&.2\&.0" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff -Nru ansible-2.4.1.0/docs/templates/playbooks_keywords.rst.j2 ansible-2.4.2.0/docs/templates/playbooks_keywords.rst.j2
--- ansible-2.4.1.0/docs/templates/playbooks_keywords.rst.j2	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/docs/templates/playbooks_keywords.rst.j2	2017-11-29 21:10:31.000000000 +0000
@@ -1,11 +1,16 @@
-Directives Glossary
-===================
+Playbook Keywords
+=================
 
-Here we list the common playbook objects and their directives.
-Note that not all directives affect the object itself and might just be there to be inherited by other contained objects.
-Aliases for the directives are not reflected here, nor are mutable ones, for example `action` in task can be substituted by the name of any module plugin.
+These are the keywords available on common playbook objects.
+
+.. note:: Please note:
+
+    * Aliases for the directives are not reflected here, nor are mutable one. For example,
+      :term:`action` in task can be substituted by the name of any Ansible module.
+    * The keywords do not have ``version_added`` information at this time
+    * Some keywords set defaults for the objects inside of them rather than for the objects
+      themselves
 
-Be aware that this reflects the 'current development branch' and that the keywords do not have 'version_added' information.
 
 .. contents::
    :local:
@@ -19,8 +24,7 @@
 
 {% for attribute in oblist[name]|sort %}
     {{ attribute }}
-        {{ oblist[name][attribute] }}
+        {{ oblist[name][attribute] |indent(8) }}
 
 {% endfor %}
-
 {% endfor %}
diff -Nru ansible-2.4.1.0/lib/ansible/cli/doc.py ansible-2.4.2.0/lib/ansible/cli/doc.py
--- ansible-2.4.1.0/lib/ansible/cli/doc.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/cli/doc.py	2017-11-29 21:10:31.000000000 +0000
@@ -98,7 +98,7 @@
         elif plugin_type == 'vars':
             loader = vars_loader
         elif plugin_type == 'inventory':
-            loader = PluginLoader('InventoryModule', 'ansible.plugins.inventory', 'inventory_plugins', 'inventory_plugins')
+            loader = PluginLoader('InventoryModule', 'ansible.plugins.inventory', C.DEFAULT_INVENTORY_PLUGIN_PATH, 'inventory_plugins')
         else:
             loader = module_loader
 
diff -Nru ansible-2.4.1.0/lib/ansible/cli/galaxy.py ansible-2.4.2.0/lib/ansible/cli/galaxy.py
--- ansible-2.4.1.0/lib/ansible/cli/galaxy.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/cli/galaxy.py	2017-11-29 21:10:31.000000000 +0000
@@ -385,8 +385,9 @@
                                         (role.name, role.install_info['version'], role.version or "unspecified"))
                         continue
                 else:
-                    display.display('- %s is already installed, skipping.' % str(role))
-                    continue
+                    if not force:
+                        display.display('- %s is already installed, skipping.' % str(role))
+                        continue
 
             try:
                 installed = role.install()
diff -Nru ansible-2.4.1.0/lib/ansible/cli/__init__.py ansible-2.4.2.0/lib/ansible/cli/__init__.py
--- ansible-2.4.1.0/lib/ansible/cli/__init__.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/cli/__init__.py	2017-11-29 21:10:31.000000000 +0000
@@ -112,6 +112,7 @@
     # -F (quit-if-one-screen) -R (allow raw ansi control chars)
     # -S (chop long lines) -X (disable termcap init and de-init)
     LESS_OPTS = 'FRSX'
+    SKIP_INVENTORY_DEFAULTS = False
 
     def __init__(self, args, callback=None):
         """
@@ -212,7 +213,9 @@
 
         # if an action needs an encrypt password (create_new_password=True) and we dont
         # have other secrets setup, then automatically add a password prompt as well.
-        if ask_vault_pass or (auto_prompt and not vault_ids):
+        # prompts cant/shouldnt work without a tty, so dont add prompt secrets
+        if ask_vault_pass or (not vault_ids and auto_prompt):
+
             id_slug = u'%s@%s' % (C.DEFAULT_VAULT_IDENTITY, u'prompt_ask_vault_pass')
             vault_ids.append(id_slug)
 
@@ -259,10 +262,6 @@
             vault_id_name, vault_id_value = CLI.split_vault_id(vault_id_slug)
             if vault_id_value in ['prompt', 'prompt_ask_vault_pass']:
 
-                # prompts cant/shouldnt work without a tty, so dont add prompt secrets
-                if not sys.stdin.isatty():
-                    continue
-
                 # --vault-id some_name@prompt_ask_vault_pass --vault-id other_name@prompt_ask_vault_pass will be a little
                 # confusing since it will use the old format without the vault id in the prompt
                 built_vault_id = vault_id_name or C.DEFAULT_VAULT_IDENTITY
@@ -424,8 +423,7 @@
 
         if inventory_opts:
             parser.add_option('-i', '--inventory', '--inventory-file', dest='inventory', action="append",
-                              help="specify inventory host path (default=[%s]) or comma separated host list. "
-                                   "--inventory-file is deprecated" % C.DEFAULT_HOST_LIST)
+                              help="specify inventory host path or comma separated host list. --inventory-file is deprecated")
             parser.add_option('--list-hosts', dest='listhosts', action='store_true',
                               help='outputs a list of matching hosts; does not execute anything else')
             parser.add_option('-l', '--limit', default=C.DEFAULT_SUBSET, dest='subset',
@@ -605,8 +603,8 @@
                     skip_tags.add(tag.strip())
             self.options.skip_tags = list(skip_tags)
 
-        # process inventory options
-        if hasattr(self.options, 'inventory'):
+        # process inventory options except for CLIs that require their own processing
+        if hasattr(self.options, 'inventory') and not self.SKIP_INVENTORY_DEFAULTS:
 
             if self.options.inventory:
 
@@ -616,7 +614,6 @@
 
                 # Ensure full paths when needed
                 self.options.inventory = [unfrackpath(opt, follow=False) if ',' not in opt else opt for opt in self.options.inventory]
-
             else:
                 self.options.inventory = C.DEFAULT_HOST_LIST
 
diff -Nru ansible-2.4.1.0/lib/ansible/cli/inventory.py ansible-2.4.2.0/lib/ansible/cli/inventory.py
--- ansible-2.4.1.0/lib/ansible/cli/inventory.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/cli/inventory.py	2017-11-29 21:10:31.000000000 +0000
@@ -170,8 +170,8 @@
             from ansible.parsing.yaml.dumper import AnsibleDumper
             results = yaml.dump(stuff, Dumper=AnsibleDumper, default_flow_style=False)
         else:
-            import json
-            results = json.dumps(stuff, sort_keys=True, indent=4)
+            from ansible.module_utils.basic import jsonify
+            results = jsonify(stuff, sort_keys=True, indent=4)
 
         return results
 
@@ -206,7 +206,7 @@
         self._remove_internal(dump)
         if self.options.show_vars:
             for (name, val) in sorted(dump.items()):
-                result.append(self._graph_name('{%s = %s}' % (name, val), depth + 1))
+                result.append(self._graph_name('{%s = %s}' % (name, val), depth))
         return result
 
     def _graph_name(self, name, depth=0):
@@ -224,7 +224,7 @@
         if group.name != 'all':
             for host in sorted(group.hosts, key=attrgetter('name')):
                 result.append(self._graph_name(host.name, depth))
-                result.extend(self._show_vars(host.get_vars(), depth))
+                result.extend(self._show_vars(host.get_vars(), depth + 1))
 
         result.extend(self._show_vars(group.get_vars(), depth))
 
@@ -245,7 +245,6 @@
             results[group.name] = {}
             if group.name != 'all':
                 results[group.name]['hosts'] = [h.name for h in sorted(group.hosts, key=attrgetter('name'))]
-            results[group.name]['vars'] = group.get_vars()
             results[group.name]['children'] = []
             for subgroup in sorted(group.child_groups, key=attrgetter('name')):
                 results[group.name]['children'].append(subgroup.name)
@@ -274,7 +273,6 @@
 
             # initialize group + vars
             results[group.name] = {}
-            results[group.name]['vars'] = group.get_vars()
 
             # subgroups
             results[group.name]['children'] = {}
diff -Nru ansible-2.4.1.0/lib/ansible/cli/pull.py ansible-2.4.2.0/lib/ansible/cli/pull.py
--- ansible-2.4.1.0/lib/ansible/cli/pull.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/cli/pull.py	2017-11-29 21:10:31.000000000 +0000
@@ -67,6 +67,8 @@
                                  "look for a playbook based on the host's fully-qualified domain name,"
                                  'on the host hostname and finally a playbook named *local.yml*.', }
 
+    SKIP_INVENTORY_DEFAULTS = True
+
     def _get_inv_cli(self):
 
         inv_opts = ''
@@ -77,9 +79,6 @@
                 elif ',' in inv or os.path.exists(inv):
                     inv_opts += ' -i %s ' % inv
 
-        if not inv_opts:
-            inv_opts = " -i localhost, "
-
         return inv_opts
 
     def parse(self):
@@ -125,9 +124,6 @@
         self.parser.add_option("--check", default=False, dest='check', action='store_true',
                                help="don't make any changes; instead, try to predict some of the changes that may occur")
 
-        # for pull we don't want a default
-        self.parser.set_defaults(inventory=None)
-
         super(PullCLI, self).parse()
 
         if not self.options.dest:
@@ -136,6 +132,9 @@
             self.options.dest = os.path.join('~/.ansible/pull', hostname)
         self.options.dest = os.path.expandvars(os.path.expanduser(self.options.dest))
 
+        if os.path.exists(self.options.dest) and not os.path.isdir(self.options.dest):
+            raise AnsibleOptionsError("%s is not a valid or accessible directory." % self.options.dest)
+
         if self.options.sleep:
             try:
                 secs = random.randint(0, int(self.options.sleep))
@@ -174,6 +173,8 @@
         # Attempt to use the inventory passed in as an argument
         # It might not yet have been downloaded so use localhost as default
         inv_opts = self._get_inv_cli()
+        if not inv_opts:
+            inv_opts = " -i localhost, "
 
         # FIXME: enable more repo modules hg/svn?
         if self.options.module_name == 'git':
diff -Nru ansible-2.4.1.0/lib/ansible/executor/play_iterator.py ansible-2.4.2.0/lib/ansible/executor/play_iterator.py
--- ansible-2.4.1.0/lib/ansible/executor/play_iterator.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/executor/play_iterator.py	2017-11-29 21:10:31.000000000 +0000
@@ -203,7 +203,9 @@
 
         self._host_states = {}
         start_at_matched = False
-        for host in inventory.get_hosts(self._play.hosts):
+        batch = inventory.get_hosts(self._play.hosts)
+        self.batch_size = len(batch)
+        for host in batch:
             self._host_states[host.name] = HostState(blocks=self._blocks)
             # if we're looking to start at a specific task, iterate through
             # the tasks for this host until we find the specified task
@@ -370,6 +372,9 @@
             elif state.run_state == self.ITERATING_RESCUE:
                 # The process here is identical to ITERATING_TASKS, except instead
                 # we move into the always portion of the block.
+                if host.name in self._play._removed_hosts:
+                    self._play._removed_hosts.remove(host.name)
+
                 if state.rescue_child_state:
                     (state.rescue_child_state, task) = self._get_next_task_from_state(state.rescue_child_state, host=host, peek=peek, in_child=True)
                     if self._check_failed_state(state.rescue_child_state):
diff -Nru ansible-2.4.1.0/lib/ansible/executor/task_executor.py ansible-2.4.2.0/lib/ansible/executor/task_executor.py
--- ansible-2.4.1.0/lib/ansible/executor/task_executor.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/executor/task_executor.py	2017-11-29 21:10:31.000000000 +0000
@@ -102,9 +102,14 @@
                     for item in item_results:
                         if 'changed' in item and item['changed'] and not res.get('changed'):
                             res['changed'] = True
-                        if 'failed' in item and item['failed'] and not res.get('failed'):
-                            res['failed'] = True
-                            res['msg'] = 'One or more items failed'
+                        if 'failed' in item and item['failed']:
+                            item_ignore = item.pop('_ansible_ignore_errors')
+                            if not res.get('failed'):
+                                res['failed'] = True
+                                res['msg'] = 'One or more items failed'
+                                self._task.ignore_errors = item_ignore
+                            elif self._task.ignore_errors and not item_ignore:
+                                self._task.ignore_errors = item_ignore
 
                         # ensure to accumulate these
                         for array in ['warnings', 'deprecations']:
@@ -289,6 +294,7 @@
             (self._task, tmp_task) = (tmp_task, self._task)
             (self._play_context, tmp_play_context) = (tmp_play_context, self._play_context)
             res = self._execute(variables=task_vars)
+            task_fields = self._task.dump_attrs()
             (self._task, tmp_task) = (tmp_task, self._task)
             (self._play_context, tmp_play_context) = (tmp_play_context, self._play_context)
 
@@ -296,6 +302,7 @@
             # to the list of results
             res[loop_var] = item
             res['_ansible_item_result'] = True
+            res['_ansible_ignore_errors'] = task_fields.get('ignore_errors')
 
             if label is not None:
                 templar = Templar(loader=self._loader, shared_loader_obj=self._shared_loader_obj, variables=self._job_vars)
@@ -306,7 +313,7 @@
                     self._host.name,
                     self._task._uuid,
                     res,
-                    task_fields=self._task.dump_attrs(),
+                    task_fields=task_fields,
                 ),
                 block=False,
             )
diff -Nru ansible-2.4.1.0/lib/ansible/executor/task_queue_manager.py ansible-2.4.2.0/lib/ansible/executor/task_queue_manager.py
--- ansible-2.4.1.0/lib/ansible/executor/task_queue_manager.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/executor/task_queue_manager.py	2017-11-29 21:10:31.000000000 +0000
@@ -27,6 +27,7 @@
 from ansible.errors import AnsibleError
 from ansible.executor.play_iterator import PlayIterator
 from ansible.executor.stats import AggregateStats
+from ansible.executor.task_result import TaskResult
 from ansible.module_utils.six import string_types
 from ansible.module_utils._text import to_text
 from ansible.playbook.block import Block
@@ -241,22 +242,6 @@
             loader=self._loader,
         )
 
-        # Fork # of forks, # of hosts or serial, whichever is lowest
-        num_hosts = len(self._inventory.get_hosts(new_play.hosts, ignore_restrictions=True))
-
-        max_serial = 0
-        if new_play.serial:
-            # the play has not been post_validated here, so we may need
-            # to convert the scalar value to a list at this point
-            serial_items = new_play.serial
-            if not isinstance(serial_items, list):
-                serial_items = [serial_items]
-            max_serial = max([pct_to_int(x, num_hosts) for x in serial_items])
-
-        contenders = [self._options.forks, max_serial, num_hosts]
-        contenders = [v for v in contenders if v is not None and v > 0]
-        self._initialize_processes(min(contenders))
-
         play_context = PlayContext(new_play, self._options, self.passwords, self._connection_lockfile.fileno())
         for callback_plugin in self._callback_plugins:
             if hasattr(callback_plugin, 'set_play_context'):
@@ -267,11 +252,6 @@
         # initialize the shared dictionary containing the notified handlers
         self._initialize_notified_handlers(new_play)
 
-        # load the specified strategy (or the default linear one)
-        strategy = strategy_loader.get(new_play.strategy, self)
-        if strategy is None:
-            raise AnsibleError("Invalid play strategy specified: %s" % new_play.strategy, obj=play._ds)
-
         # build the iterator
         iterator = PlayIterator(
             inventory=self._inventory,
@@ -282,6 +262,14 @@
             start_at_done=self._start_at_done,
         )
 
+        # adjust to # of workers to configured forks or size of batch, whatever is lower
+        self._initialize_processes(min(self._options.forks, iterator.batch_size))
+
+        # load the specified strategy (or the default linear one)
+        strategy = strategy_loader.get(new_play.strategy, self)
+        if strategy is None:
+            raise AnsibleError("Invalid play strategy specified: %s" % new_play.strategy, obj=play._ds)
+
         # Because the TQM may survive multiple play runs, we start by marking
         # any hosts as failed in the iterator here which may have been marked
         # as failed in previous runs. Then we clear the internal list of failed
@@ -371,9 +359,20 @@
                 if gotit is not None:
                     methods.append(gotit)
 
+            # send clean copies
+            new_args = []
+            for arg in args:
+                # FIXME: add play/task cleaners
+                if isinstance(arg, TaskResult):
+                    new_args.append(arg.clean_copy())
+                # elif isinstance(arg, Play):
+                # elif isinstance(arg, Task):
+                else:
+                    new_args.append(arg)
+
             for method in methods:
                 try:
-                    method(*args, **kwargs)
+                    method(*new_args, **kwargs)
                 except Exception as e:
                     # TODO: add config toggle to make this fatal or not?
                     display.warning(u"Failure using method (%s) in callback plugin (%s): %s" % (to_text(method_name), to_text(callback_plugin), to_text(e)))
diff -Nru ansible-2.4.1.0/lib/ansible/executor/task_result.py ansible-2.4.2.0/lib/ansible/executor/task_result.py
--- ansible-2.4.1.0/lib/ansible/executor/task_result.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/executor/task_result.py	2017-11-29 21:10:31.000000000 +0000
@@ -19,7 +19,12 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+from copy import deepcopy
+
 from ansible.parsing.dataloader import DataLoader
+from ansible.vars.manager import strip_internal_keys
+
+_IGNORE = ('failed', 'skipped')
 
 
 class TaskResult:
@@ -83,3 +88,32 @@
                 if isinstance(res, dict):
                     flag |= res.get(key, False)
             return flag
+
+    def clean_copy(self):
+
+        ''' returns 'clean' taskresult object '''
+
+        # FIXME: clean task_fields, _task and _host copies
+        result = TaskResult(self._host, self._task, {}, self._task_fields)
+
+        # statuses are already reflected on the event type
+        if result._task and result._task.action in ['debug']:
+            # debug is verbose by default to display vars, no need to add invocation
+            ignore = _IGNORE + ('invocation',)
+        else:
+            ignore = _IGNORE
+
+        if self._result.get('_ansible_no_log', False):
+            result._result = {"censored": "the output has been hidden due to the fact that 'no_log: true' was specified for this result"}
+        elif self._result:
+            result._result = deepcopy(self._result)
+
+            # actualy remove
+            for remove_key in ignore:
+                if remove_key in result._result:
+                    del result._result[remove_key]
+
+            # remove almost ALL internal keys, keep ones relevant to callback
+            strip_internal_keys(result._result, exceptions=('_ansible_verbose_always', '_ansible_item_label', '_ansible_no_log'))
+
+        return result
diff -Nru ansible-2.4.1.0/lib/ansible/inventory/data.py ansible-2.4.2.0/lib/ansible/inventory/data.py
--- ansible-2.4.1.0/lib/ansible/inventory/data.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/inventory/data.py	2017-11-29 21:10:31.000000000 +0000
@@ -79,23 +79,18 @@
         else:
             new_host = Host(pattern)
 
-            # use 'all' vars but not part of all group
-            new_host.vars = self.groups['all'].get_vars()
-
             new_host.address = "127.0.0.1"
             new_host.implicit = True
 
-            if "ansible_python_interpreter" not in new_host.vars:
-                py_interp = sys.executable
-                if not py_interp:
-                    # sys.executable is not set in some cornercases.  #13585
-                    py_interp = '/usr/bin/python'
-                    display.warning('Unable to determine python interpreter from sys.executable. Using /usr/bin/python default. '
-                                    'You can correct this by setting ansible_python_interpreter for localhost')
-                new_host.set_variable("ansible_python_interpreter", py_interp)
-
-            if "ansible_connection" not in new_host.vars:
-                new_host.set_variable("ansible_connection", 'local')
+            # set localhost defaults
+            py_interp = sys.executable
+            if not py_interp:
+                # sys.executable is not set in some cornercases. see issue #13585
+                py_interp = '/usr/bin/python'
+                display.warning('Unable to determine python interpreter from sys.executable. Using /usr/bin/python default. '
+                                'You can correct this by setting ansible_python_interpreter for localhost')
+            new_host.set_variable("ansible_python_interpreter", py_interp)
+            new_host.set_variable("ansible_connection", 'local')
 
             self.localhost = new_host
 
diff -Nru ansible-2.4.1.0/lib/ansible/inventory/manager.py ansible-2.4.2.0/lib/ansible/inventory/manager.py
--- ansible-2.4.1.0/lib/ansible/inventory/manager.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/inventory/manager.py	2017-11-29 21:10:31.000000000 +0000
@@ -28,7 +28,7 @@
 from ansible.errors import AnsibleError, AnsibleOptionsError, AnsibleParserError
 from ansible.inventory.data import InventoryData
 from ansible.module_utils.six import string_types
-from ansible.module_utils._text import to_bytes, to_native
+from ansible.module_utils._text import to_bytes, to_native, to_text
 from ansible.parsing.utils.addresses import parse_address
 from ansible.plugins.loader import PluginLoader
 from ansible.utils.path import unfrackpath
@@ -85,11 +85,12 @@
 
     if isinstance(pattern, list):
         return list(itertools.chain(*map(split_host_pattern, pattern)))
+    elif not isinstance(pattern, string_types):
+        pattern = to_native(pattern)
 
     # If it's got commas in it, we'll treat it as a straightforward
     # comma-separated list of patterns.
-
-    elif ',' in pattern:
+    if ',' in pattern:
         patterns = re.split('\s*,\s*', pattern)
 
     # If it doesn't, it could still be a single pattern. This accounts for
@@ -98,7 +99,7 @@
         try:
             (base, port) = parse_address(pattern, allow_ranges=True)
             patterns = [pattern]
-        except:
+        except Exception:
             # The only other case we accept is a ':'-separated list of patterns.
             # This mishandles IPv6 addresses, and is retained only for backwards
             # compatibility.
@@ -258,13 +259,16 @@
                     try:
                         plugin.parse(self._inventory, self._loader, source, cache=cache)
                         parsed = True
-                        display.vvv('Parsed %s inventory source with %s plugin' % (to_native(source), plugin_name))
+                        display.vvv('Parsed %s inventory source with %s plugin' % (to_text(source), plugin_name))
                         break
                     except AnsibleParserError as e:
-                        display.debug('%s did not meet %s requirements' % (to_native(source), plugin_name))
+                        display.debug('%s was not parsable by %s' % (to_text(source), plugin_name))
+                        failures.append({'src': source, 'plugin': plugin_name, 'exc': e})
+                    except Exception as e:
+                        display.debug('%s failed to parse %s' % (plugin_name, to_text(source)))
                         failures.append({'src': source, 'plugin': plugin_name, 'exc': e})
                 else:
-                    display.debug('%s did not meet %s requirements' % (to_native(source), plugin_name))
+                    display.debug('%s did not meet %s requirements' % (to_text(source), plugin_name))
             else:
                 if not parsed and failures:
                     # only if no plugin processed files should we show errors.
@@ -277,11 +281,10 @@
                         raise AnsibleParserError(msg)
                     else:
                         for fail in failures:
-                            display.warning('\n* Failed to parse %s with %s plugin: %s' % (to_native(fail['src']), fail['plugin'], to_native(fail['exc'])))
-                            display.vvv(fail['exc'].tb)
-
+                            display.warning(u'\n* Failed to parse %s with %s plugin: %s' % (to_text(fail['src']), fail['plugin'], to_text(fail['exc'])))
+                            display.vvv(to_text(fail['exc'].tb))
         if not parsed:
-            display.warning("Unable to parse %s as an inventory source" % to_native(source))
+            display.warning("Unable to parse %s as an inventory source" % to_text(source))
 
         # clear up, jic
         self._inventory.current_source = None
@@ -521,7 +524,9 @@
         if matching_groups:
             for groupname in matching_groups:
                 results.extend(self._inventory.groups[groupname].get_hosts())
-        else:
+
+        # check hosts if no groups matched or it is a regex/glob pattern
+        if not matching_groups or pattern.startswith('~') or any(special in pattern for special in ('.', '?', '*', '[')):
             # pattern might match host
             matching_hosts = self._match_list(self._inventory.hosts, pattern)
             if matching_hosts:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/aws_s3.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/aws_s3.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/aws_s3.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/aws_s3.py	2017-11-29 21:10:31.000000000 +0000
@@ -354,7 +354,8 @@
         # if there are contents then we need to delete them before we can delete the bucket
         for keys in paginated_list(s3, Bucket=bucket):
             formatted_keys = [{'Key': key} for key in keys]
-            s3.delete_objects(Bucket=bucket, Delete={'Objects': formatted_keys})
+            if formatted_keys:
+                s3.delete_objects(Bucket=bucket, Delete={'Objects': formatted_keys})
         s3.delete_bucket(Bucket=bucket)
         return True
     except botocore.exceptions.ClientError as e:
@@ -375,12 +376,10 @@
     if module.check_mode:
         module.exit_json(msg="PUT operation skipped - running in check mode", changed=True)
     try:
-        bucket = s3.Bucket(bucket)
-        key = bucket.new_key(obj)
-        key.set_contents_from_string('')
+        s3.put_object(Bucket=bucket, Key=obj, Body=b'')
         for acl in module.params.get('permission'):
             s3.put_object_acl(ACL=acl, Bucket=bucket, Key=obj)
-        module.exit_json(msg="Virtual directory %s created in bucket %s" % (obj, bucket.name), changed=True)
+        module.exit_json(msg="Virtual directory %s created in bucket %s" % (obj, bucket), changed=True)
     except botocore.exceptions.ClientError as e:
         module.fail_json(msg="Failed while creating object %s." % obj, exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/cloudformation.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/cloudformation.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/cloudformation.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/cloudformation.py	2017-11-29 21:10:31.000000000 +0000
@@ -121,7 +121,7 @@
 extends_documentation_fragment:
 - aws
 - ec2
-requirements: [ botocore>=1.4.57 ]
+requirements: [ boto3, botocore>=1.4.57 ]
 '''
 
 EXAMPLES = '''
@@ -302,7 +302,8 @@
 def create_changeset(module, stack_params, cfn):
     if 'TemplateBody' not in stack_params and 'TemplateURL' not in stack_params:
         module.fail_json(msg="Either 'template' or 'template_url' is required.")
-
+    if module.params['changeset_name'] is not None:
+        stack_params['ChangeSetName'] = module.params['changeset_name']
     try:
         changeset_name = build_changeset_name(stack_params)
         stack_params['ChangeSetName'] = changeset_name
@@ -502,11 +503,10 @@
     else:
         stack_params['NotificationARNs'] = []
 
-    if module.params['stack_policy'] is not None:
+    # can't check the policy when verifying.
+    if module.params['stack_policy'] is not None and not module.check_mode:
         stack_params['StackPolicyBody'] = open(module.params['stack_policy'], 'r').read()
 
-    if module.params['changeset_name'] is not None:
-        stack_params['ChangeSetName'] = module.params['changeset_name']
 
     template_parameters = module.params['template_parameters']
     stack_params['Parameters'] = [{'ParameterKey':k, 'ParameterValue':str(v)} for k, v in template_parameters.items()]
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/dynamodb_table.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/dynamodb_table.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/dynamodb_table.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/dynamodb_table.py	2017-11-29 21:10:31.000000000 +0000
@@ -184,7 +184,7 @@
 INDEX_TYPE_OPTIONS = ['all', 'global_all', 'global_include', 'global_keys_only', 'include', 'keys_only']
 
 
-def create_or_update_dynamo_table(connection, module, boto3_dynamodb=None, boto3_sts=None):
+def create_or_update_dynamo_table(connection, module, boto3_dynamodb=None, boto3_sts=None, region=None):
     table_name = module.params.get('name')
     hash_key_name = module.params.get('hash_key_name')
     hash_key_type = module.params.get('hash_key_type')
@@ -193,7 +193,6 @@
     read_capacity = module.params.get('read_capacity')
     write_capacity = module.params.get('write_capacity')
     all_indexes = module.params.get('indexes')
-    region = module.params.get('region')
     tags = module.params.get('tags')
     wait_for_active_timeout = module.params.get('wait_for_active_timeout')
 
@@ -481,7 +480,7 @@
 
     state = module.params.get('state')
     if state == 'present':
-        create_or_update_dynamo_table(connection, module, boto3_dynamodb, boto3_sts)
+        create_or_update_dynamo_table(connection, module, boto3_dynamodb, boto3_sts, region)
     elif state == 'absent':
         delete_dynamo_table(connection, module)
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/ec2_lc.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/ec2_lc.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/ec2_lc.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/ec2_lc.py	2017-11-29 21:10:31.000000000 +0000
@@ -254,7 +254,7 @@
     classic_link_vpc_id = module.params.get('classic_link_vpc_id')
     classic_link_vpc_security_groups = module.params.get('classic_link_vpc_security_groups')
 
-    block_device_mapping = {}
+    block_device_mapping = []
 
     convert_list = ['image_id', 'instance_type', 'instance_type', 'instance_id', 'placement_tenancy', 'key_name', 'kernel_id', 'ramdisk_id', 'spot_price']
 
@@ -273,7 +273,7 @@
                 module.fail_json(msg='Device name must be set for volume')
             # Minimum volume size is 1GB. We'll use volume size explicitly set to 0 to be a signal not to create this volume
             if 'volume_size' not in volume or int(volume['volume_size']) > 0:
-                block_device_mapping.update(create_block_device_meta(module, volume))
+                block_device_mapping.append(create_block_device_meta(module, volume))
 
     try:
         launch_configs = connection.describe_launch_configurations(LaunchConfigurationNames=[name]).get('LaunchConfigurations')
@@ -298,7 +298,7 @@
         launch_config['ClassicLinkVPCSecurityGroups'] = classic_link_vpc_security_groups
 
     if block_device_mapping:
-        launch_config['BlockDeviceMappings'] = [block_device_mapping]
+        launch_config['BlockDeviceMappings'] = block_device_mapping
 
     if instance_profile_name is not None:
         launch_config['IamInstanceProfile'] = instance_profile_name
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/ec2_vpc_subnet.py	2017-11-29 21:10:31.000000000 +0000
@@ -124,6 +124,9 @@
 
 def create_subnet(conn, module, vpc_id, cidr, az, check_mode):
     try:
+        # Specifying the availability zone is optional.
+        if not az:
+            az = ''
         new_subnet = get_subnet_info(conn.create_subnet(VpcId=vpc_id, CidrBlock=cidr, AvailabilityZone=az))
         # Sometimes AWS takes its time to create a subnet and so using
         # new subnets's id to do things like create tags results in
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/elb_application_lb.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/elb_application_lb.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/elb_application_lb.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/elb_application_lb.py	2017-11-29 21:10:31.000000000 +0000
@@ -538,9 +538,13 @@
         if current_listener['SslPolicy'] != new_listener['SslPolicy']:
             modified_listener['SslPolicy'] = new_listener['SslPolicy']
         if current_listener['Certificates'][0]['CertificateArn'] != new_listener['Certificates'][0]['CertificateArn']:
+            modified_listener['Certificates'] = []
+            modified_listener['Certificates'].append({})
             modified_listener['Certificates'][0]['CertificateArn'] = new_listener['Certificates'][0]['CertificateArn']
     elif current_listener['Protocol'] != 'HTTPS' and new_listener['Protocol'] == 'HTTPS':
         modified_listener['SslPolicy'] = new_listener['SslPolicy']
+        modified_listener['Certificates'] = []
+        modified_listener['Certificates'].append({})
         modified_listener['Certificates'][0]['CertificateArn'] = new_listener['Certificates'][0]['CertificateArn']
 
     # Default action
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/elb_target_group.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/elb_target_group.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/elb_target_group.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/elb_target_group.py	2017-11-29 21:10:31.000000000 +0000
@@ -458,7 +458,7 @@
                     instances_to_add = []
                     for target in params['Targets']:
                         if target['Id'] in add_instances:
-                            instances_to_add.append(target)
+                            instances_to_add.append({'Id': target['Id'], 'Port': int(target['Port'])})
 
                     changed = True
                     try:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/iam.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/iam.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/iam.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/iam.py	2017-11-29 21:10:31.000000000 +0000
@@ -160,6 +160,31 @@
           Service: lambda.amazonaws.com
 
 '''
+RETURN = '''
+role_result:
+    description: the IAM.role dict returned by Boto
+    type: string
+    returned: if iam_type=role and state=present
+    sample: {
+                "arn": "arn:aws:iam::A1B2C3D4E5F6:role/my-new-role",
+                "assume_role_policy_document": "...truncated...",
+                "create_date": "2017-09-02T14:32:23Z",
+                "path": "/",
+                "role_id": "AROAA1B2C3D4E5F6G7H8I",
+                "role_name": "my-new-role"
+            }
+roles:
+    description: a list containing the name of the currently defined roles
+    type: list
+    returned: if iam_type=role and state=present
+    sample: [
+        "my-new-role",
+        "my-existing-role-1",
+        "my-existing-role-2",
+        "my-existing-role-3",
+        "my-existing-role-...",
+    ]
+'''
 
 import json
 import itertools
@@ -536,7 +561,7 @@
             changed = True
             iam_role_result = iam.create_role(name,
                 assume_role_policy_document=trust_policy_doc,
-                path=path).create_role_response.create_role_result.role.role_name
+                path=path).create_role_response.create_role_result.role
 
             if name not in prof_list:
                 instance_profile_result = iam.create_instance_profile(name,
@@ -548,6 +573,7 @@
         module.fail_json(changed=changed, msg=str(err))
     else:
         updated_role_list = list_all_roles(iam)
+        iam_role_result = iam.get_role(name).get_role_response.get_role_result.role
     return changed, updated_role_list, iam_role_result, instance_profile_result
 
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/_s3.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/_s3.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/_s3.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/_s3.py	2017-11-29 21:10:31.000000000 +0000
@@ -354,7 +354,8 @@
         # if there are contents then we need to delete them before we can delete the bucket
         for keys in paginated_list(s3, Bucket=bucket):
             formatted_keys = [{'Key': key} for key in keys]
-            s3.delete_objects(Bucket=bucket, Delete={'Objects': formatted_keys})
+            if formatted_keys:
+                s3.delete_objects(Bucket=bucket, Delete={'Objects': formatted_keys})
         s3.delete_bucket(Bucket=bucket)
         return True
     except botocore.exceptions.ClientError as e:
@@ -375,12 +376,10 @@
     if module.check_mode:
         module.exit_json(msg="PUT operation skipped - running in check mode", changed=True)
     try:
-        bucket = s3.Bucket(bucket)
-        key = bucket.new_key(obj)
-        key.set_contents_from_string('')
+        s3.put_object(Bucket=bucket, Key=obj, Body=b'')
         for acl in module.params.get('permission'):
             s3.put_object_acl(ACL=acl, Bucket=bucket, Key=obj)
-        module.exit_json(msg="Virtual directory %s created in bucket %s" % (obj, bucket.name), changed=True)
+        module.exit_json(msg="Virtual directory %s created in bucket %s" % (obj, bucket), changed=True)
     except botocore.exceptions.ClientError as e:
         module.fail_json(msg="Failed while creating object %s." % obj, exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/sns_topic.py ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/sns_topic.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/amazon/sns_topic.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/amazon/sns_topic.py	2017-11-29 21:10:31.000000000 +0000
@@ -280,7 +280,7 @@
         for (protocol, endpoint) in desired_subscriptions:
             if (protocol, endpoint) not in subscriptions_existing_list:
                 self.changed = True
-                self.subscriptions_added.append(sub)
+                self.subscriptions_added.append((protocol, endpoint))
                 if not self.check_mode:
                     self.connection.subscribe(self.arn_topic, protocol, endpoint)
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/azure/azure_rm_acs.py ansible-2.4.2.0/lib/ansible/modules/cloud/azure/azure_rm_acs.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/azure/azure_rm_acs.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/azure/azure_rm_acs.py	2017-11-29 21:10:31.000000000 +0000
@@ -619,6 +619,8 @@
 
                 self.log("Creation / Update done")
         elif self.state == 'absent':
+            if self.check_mode:
+                return self.results
             self.delete_acs()
             self.log("ACS instance deleted")
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py ansible-2.4.2.0/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/azure/azure_rm_dnsrecordset.py	2017-11-29 21:10:31.000000000 +0000
@@ -324,7 +324,6 @@
         if self.results['changed']:
             if self.state == 'present':
                 record_set_args = dict(
-                    type=self.record_type,
                     ttl=self.time_to_live
                 )
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py ansible-2.4.2.0/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/centurylink/clc_firewall_policy.py	2017-11-29 21:10:31.000000000 +0000
@@ -166,7 +166,7 @@
 __version__ = '${version}'
 
 import os
-import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 from time import sleep
 from distutils.version import LooseVersion
 
@@ -288,7 +288,7 @@
         :return: policy_id: firewall policy id from creation call
         """
         url = response.get('links')[0]['href']
-        path = urlparse.urlparse(url).path
+        path = urlparse(url).path
         path_list = os.path.split(path)
         policy_id = path_list[-1]
         return policy_id
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/docker/_docker.py ansible-2.4.2.0/lib/ansible/modules/cloud/docker/_docker.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/docker/_docker.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/docker/_docker.py	2017-11-29 21:10:31.000000000 +0000
@@ -516,11 +516,7 @@
 import json
 import os
 import shlex
-try:
-    from urlparse import urlparse
-except ImportError:
-    # python3
-    from urllib.parse import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 
 try:
     import docker.client
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/lxc/lxc_container.py ansible-2.4.2.0/lib/ansible/modules/cloud/lxc/lxc_container.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/lxc/lxc_container.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/lxc/lxc_container.py	2017-11-29 21:10:31.000000000 +0000
@@ -725,7 +725,7 @@
 
         container_config_file = self.container.config_file_name
         with open(container_config_file, 'rb') as f:
-            container_config = to_text(f.read(), errors='surrogate_or_strict').splitlines()
+            container_config = to_text(f.read(), errors='surrogate_or_strict').splitlines(True)
 
         # Note used ast literal_eval because AnsibleModule does not provide for
         # adequate dictionary parsing.
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/openstack/os_floating_ip.py ansible-2.4.2.0/lib/ansible/modules/cloud/openstack/os_floating_ip.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/openstack/os_floating_ip.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/openstack/os_floating_ip.py	2017-11-29 21:10:31.000000000 +0000
@@ -211,8 +211,21 @@
                     network_id = cloud.get_network(name_or_id=network)["id"]
                 else:
                     network_id = None
-                if all([(fixed_address and f_ip.fixed_ip_address == fixed_address) or
-                        (nat_destination and f_ip.internal_network == fixed_address),
+                # check if we have floting ip on given nat_destination network
+                if nat_destination:
+                    nat_floating_addrs = [addr for addr in server.addresses.get(
+                        cloud.get_network(nat_destination)['name'], [])
+                        if addr.addr == public_ip and
+                        addr['OS-EXT-IPS:type'] == 'floating']
+
+                    if len(nat_floating_addrs) == 0:
+                        module.fail_json(msg="server {server} already has a "
+                                             "floating-ip on a different "
+                                             "nat-destination than '{nat_destination}'"
+                                         .format(server=server_name_or_id,
+                                                 nat_destination=nat_destination))
+
+                if all([fixed_address, f_ip.fixed_ip_address == fixed_address,
                         network, f_ip.network != network_id]):
                     # Current state definitely conflicts with requirements
                     module.fail_json(msg="server {server} already has a "
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_cluster.py	2017-11-29 21:10:31.000000000 +0000
@@ -408,11 +408,7 @@
                 ),
             ) if self.param('resilience_policy') else None,
             fencing_policy=otypes.FencingPolicy(
-                enabled=(
-                    self.param('fence_enabled') or
-                    self.param('fence_skip_if_connectivity_broken') or
-                    self.param('fence_skip_if_sd_active')
-                ),
+                enabled=self.param('fence_enabled'),
                 skip_if_connectivity_broken=otypes.SkipIfConnectivityBroken(
                     enabled=self.param('fence_skip_if_connectivity_broken'),
                     threshold=self.param('fence_connectivity_threshold'),
@@ -422,7 +418,7 @@
                 ) else None,
                 skip_if_sd_active=otypes.SkipIfSdActive(
                     enabled=self.param('fence_skip_if_sd_active'),
-                ) if self.param('fence_skip_if_sd_active') else None,
+                ) if self.param('fence_skip_if_sd_active') is not None else None,
             ) if (
                 self.param('fence_enabled') is not None or
                 self.param('fence_skip_if_sd_active') is not None or
@@ -441,7 +437,7 @@
                 ),
             ) if self.param('memory_policy') else None,
             ksm=otypes.Ksm(
-                enabled=self.param('ksm') or self.param('ksm_numa'),
+                enabled=self.param('ksm'),
                 merge_across_nodes=not self.param('ksm_numa'),
             ) if (
                 self.param('ksm_numa') is not None or
@@ -484,8 +480,8 @@
             equal(self.param('gluster'), entity.gluster_service) and
             equal(self.param('virt'), entity.virt_service) and
             equal(self.param('threads_as_cores'), entity.threads_as_cores) and
-            equal(self.param('ksm_numa'), not entity.ksm.merge_across_nodes and entity.ksm.enabled) and
-            equal(self.param('ksm'), entity.ksm.merge_across_nodes and entity.ksm.enabled) and
+            equal(self.param('ksm_numa'), not entity.ksm.merge_across_nodes) and
+            equal(self.param('ksm'), entity.ksm.enabled) and
             equal(self.param('ha_reservation'), entity.ha_reservation) and
             equal(self.param('trusted_service'), entity.trusted_service) and
             equal(self.param('host_reason'), entity.maintenance_reason_required) and
@@ -517,7 +513,7 @@
                 ])
             ) and
             equal(
-                get_id_by_name(self._connection.system_service().mac_pools_service(), self.param('mac_pool')),
+                get_id_by_name(self._connection.system_service().mac_pools_service(), self.param('mac_pool'), raise_error=False),
                 entity.mac_pool.id
             )
         )
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/_ovirt_clusters.py	2017-11-29 21:10:31.000000000 +0000
@@ -408,11 +408,7 @@
                 ),
             ) if self.param('resilience_policy') else None,
             fencing_policy=otypes.FencingPolicy(
-                enabled=(
-                    self.param('fence_enabled') or
-                    self.param('fence_skip_if_connectivity_broken') or
-                    self.param('fence_skip_if_sd_active')
-                ),
+                enabled=self.param('fence_enabled'),
                 skip_if_connectivity_broken=otypes.SkipIfConnectivityBroken(
                     enabled=self.param('fence_skip_if_connectivity_broken'),
                     threshold=self.param('fence_connectivity_threshold'),
@@ -422,7 +418,7 @@
                 ) else None,
                 skip_if_sd_active=otypes.SkipIfSdActive(
                     enabled=self.param('fence_skip_if_sd_active'),
-                ) if self.param('fence_skip_if_sd_active') else None,
+                ) if self.param('fence_skip_if_sd_active') is not None else None,
             ) if (
                 self.param('fence_enabled') is not None or
                 self.param('fence_skip_if_sd_active') is not None or
@@ -441,7 +437,7 @@
                 ),
             ) if self.param('memory_policy') else None,
             ksm=otypes.Ksm(
-                enabled=self.param('ksm') or self.param('ksm_numa'),
+                enabled=self.param('ksm'),
                 merge_across_nodes=not self.param('ksm_numa'),
             ) if (
                 self.param('ksm_numa') is not None or
@@ -484,8 +480,8 @@
             equal(self.param('gluster'), entity.gluster_service) and
             equal(self.param('virt'), entity.virt_service) and
             equal(self.param('threads_as_cores'), entity.threads_as_cores) and
-            equal(self.param('ksm_numa'), not entity.ksm.merge_across_nodes and entity.ksm.enabled) and
-            equal(self.param('ksm'), entity.ksm.merge_across_nodes and entity.ksm.enabled) and
+            equal(self.param('ksm_numa'), not entity.ksm.merge_across_nodes) and
+            equal(self.param('ksm'), entity.ksm.enabled) and
             equal(self.param('ha_reservation'), entity.ha_reservation) and
             equal(self.param('trusted_service'), entity.trusted_service) and
             equal(self.param('host_reason'), entity.maintenance_reason_required) and
@@ -517,7 +513,7 @@
                 ])
             ) and
             equal(
-                get_id_by_name(self._connection.system_service().mac_pools_service(), self.param('mac_pool')),
+                get_id_by_name(self._connection.system_service().mac_pools_service(), self.param('mac_pool'), raise_error=False),
                 entity.mac_pool.id
             )
         )
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_disk.py ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_disk.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_disk.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_disk.py	2017-11-29 21:10:31.000000000 +0000
@@ -236,11 +236,7 @@
 from httplib import HTTPSConnection
 from httplib import IncompleteRead
 
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
-
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 
 try:
     import ovirtsdk4.types as otypes
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/_ovirt_disks.py	2017-11-29 21:10:31.000000000 +0000
@@ -236,11 +236,7 @@
 from httplib import HTTPSConnection
 from httplib import IncompleteRead
 
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
-
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 
 try:
     import ovirtsdk4.types as otypes
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_host_networks.py ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_host_networks.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_host_networks.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_host_networks.py	2017-11-29 21:10:31.000000000 +0000
@@ -194,6 +194,7 @@
         update = False
         bond = self._module.params['bond']
         networks = self._module.params['networks']
+        labels = self._module.params['labels']
         nic = get_entity(nic_service)
 
         if nic is None:
@@ -209,6 +210,12 @@
                 )
             )
 
+        # Check if labels need to be updated on interface/bond:
+        if labels:
+            net_labels = nic_service.network_labels_service().list()
+            if sorted(labels) != sorted([lbl.id for lbl in net_labels]):
+                return True
+
         if not networks:
             return update
 
@@ -307,7 +314,7 @@
                 ] if bond else None,
                 modified_labels=[
                     otypes.NetworkLabel(
-                        name=str(name),
+                        id=str(name),
                         host_nic=otypes.HostNic(
                             name=bond.get('name') if bond else interface
                         ),
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/ovirt/ovirt_hosts.py	2017-11-29 21:10:31.000000000 +0000
@@ -317,6 +317,28 @@
             timeout=self.param('timeout'),
         )
 
+    def failed_state_after_reinstall(self, host, count=0):
+        if host.status in [
+            hoststate.ERROR,
+            hoststate.INSTALL_FAILED,
+            hoststate.NON_OPERATIONAL,
+        ]:
+            return True
+
+        # If host is in non-responsive state after upgrade/install
+        # let's wait for few seconds and re-check again the state:
+        if host.status == hoststate.NON_RESPONSIVE:
+            if count <= 3:
+                time.sleep(20)
+                return self.failed_state_after_reinstall(
+                    self._service.service(host.id).get(),
+                    count + 1,
+                )
+            else:
+                return True
+
+        return False
+
 
 def failed_state(host):
     return host.status in [
@@ -421,7 +443,7 @@
                     module.params.get('hosted_engine') == 'deploy'
                 ) if module.params.get('hosted_engine') is not None else None,
                 result_state=hoststate.UP if host is None else None,
-                fail_condition=failed_state if host is None else lambda h: False,
+                fail_condition=hosts_module.failed_state_after_reinstall if host is None else lambda h: False,
             )
             if module.params['activate'] and host is not None:
                 ret = hosts_module.action(
@@ -473,7 +495,7 @@
                 action_condition=lambda h: h.update_available,
                 wait_condition=lambda h: h.status == result_state,
                 post_action=lambda h: time.sleep(module.params['poll_interval']),
-                fail_condition=failed_state,
+                fail_condition=hosts_module.failed_state_after_reinstall,
             )
         elif state == 'iscsidiscover':
             host_id = get_id_by_name(hosts_service, module.params['name'])
@@ -546,7 +568,7 @@
                 action_condition=lambda h: h.status == hoststate.MAINTENANCE,
                 post_action=hosts_module.post_reinstall,
                 wait_condition=lambda h: h.status == hoststate.MAINTENANCE,
-                fail_condition=failed_state,
+                fail_condition=hosts_module.failed_state_after_reinstall,
                 host=otypes.Host(
                     override_iptables=module.params['override_iptables'],
                 ) if module.params['override_iptables'] else None,
diff -Nru ansible-2.4.1.0/lib/ansible/modules/cloud/vmware/vmware_guest.py ansible-2.4.2.0/lib/ansible/modules/cloud/vmware/vmware_guest.py
--- ansible-2.4.1.0/lib/ansible/modules/cloud/vmware/vmware_guest.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/cloud/vmware/vmware_guest.py	2017-11-29 21:10:31.000000000 +0000
@@ -1166,6 +1166,21 @@
 
         return root
 
+    def get_resource_pool(self):
+
+        resource_pool = None
+
+        if self.params['esxi_hostname']:
+            host = self.select_host()
+            resource_pool = self.select_resource_pool_by_host(host)
+        else:
+            resource_pool = self.select_resource_pool_by_name(self.params['resource_pool'])
+
+        if resource_pool is None:
+            self.module.fail_json(msg='Unable to find resource pool "%(resource_pool)s"' % self.params)
+
+        return resource_pool
+
     def deploy_vm(self):
         # https://github.com/vmware/pyvmomi-community-samples/blob/master/samples/clone_vm.py
         # https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.CloneSpec.html
@@ -1215,14 +1230,7 @@
 
         # need a resource pool if cloning from template
         if self.params['resource_pool'] or self.params['template']:
-            if self.params['esxi_hostname']:
-                host = self.select_host()
-                resource_pool = self.select_resource_pool_by_host(host)
-            else:
-                resource_pool = self.select_resource_pool_by_name(self.params['resource_pool'])
-
-            if resource_pool is None:
-                self.module.fail_json(msg='Unable to find resource pool "%(resource_pool)s"' % self.params)
+            resource_pool = self.get_resource_pool()
 
         # set the destination datastore for VM & disks
         (datastore, datastore_name) = self.select_datastore(vm_obj)
@@ -1289,6 +1297,7 @@
                                                         vmPathName="[" + datastore_name + "] " + self.params["name"])
 
                 clone_method = 'CreateVM_Task'
+                resource_pool = self.get_resource_pool()
                 task = destfolder.CreateVM_Task(config=self.configspec, pool=resource_pool)
                 self.change_detected = True
             self.wait_for_task(task)
diff -Nru ansible-2.4.1.0/lib/ansible/modules/commands/script.py ansible-2.4.2.0/lib/ansible/modules/commands/script.py
--- ansible-2.4.1.0/lib/ansible/modules/commands/script.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/commands/script.py	2017-11-29 21:10:31.000000000 +0000
@@ -26,7 +26,7 @@
 options:
   free_form:
     description:
-      - path to the local script file followed by optional arguments. There is no parameter actually named 'free form'; see the examples!
+      - Path to the local script file followed by optional arguments. There is no parameter actually named 'free form'; see the examples!
     required: true
     default: null
     aliases: []
@@ -53,6 +53,7 @@
   - The ssh connection plugin will force pseudo-tty allocation via -tt when scripts are executed. pseudo-ttys do not have a stderr channel and all
     stderr is sent to stdout. If you depend on separated stdout and stderr result keys, please switch to a copy+command set of tasks instead of using script.
   - This module is also supported for Windows targets.
+  - If the path to the local script contains spaces, it needs to be quoted.
 author:
     - Ansible Core Team
     - Michael DeHaan
diff -Nru ansible-2.4.1.0/lib/ansible/modules/files/blockinfile.py ansible-2.4.2.0/lib/ansible/modules/files/blockinfile.py
--- ansible-2.4.1.0/lib/ansible/modules/files/blockinfile.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/files/blockinfile.py	2017-11-29 21:10:31.000000000 +0000
@@ -117,11 +117,12 @@
           address 192.0.2.23
           netmask 255.255.255.0
 
-- name: insert/update configuration using a local file
+- name: insert/update configuration using a local file and validate it
   blockinfile:
     block: "{{ lookup('file', './local/ssh_config') }}"
     dest: "/etc/ssh/ssh_config"
     backup: yes
+    validate: "/usr/sbin/sshd -T -f %s"
 
 - name: insert/update HTML surrounded by custom markers after <body> line
   blockinfile:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/net_tools/cloudflare_dns.py ansible-2.4.2.0/lib/ansible/modules/net_tools/cloudflare_dns.py
--- ansible-2.4.1.0/lib/ansible/modules/net_tools/cloudflare_dns.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/net_tools/cloudflare_dns.py	2017-11-29 21:10:32.000000000 +0000
@@ -274,10 +274,11 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six.moves.urllib.parse import urlencode
-from ansible.module_utils._text import to_native
+from ansible.module_utils._text import to_native, to_text
 from ansible.module_utils.urls import fetch_url
 
 
+
 class CloudflareAPI(object):
 
     cf_api_endpoint = 'https://api.cloudflare.com/client/v4'
@@ -369,9 +370,9 @@
 
         if content:
             try:
-                result = json.loads(content)
-            except json.JSONDecodeError:
-                error_msg += "; Failed to parse API response: {0}".format(content)
+                result = json.loads(to_text(content, errors='surrogate_or_strict'))
+            except (json.JSONDecodeError, UnicodeError) as e:
+                error_msg += "; Failed to parse API response with error {0}: {1}".format(to_native(e), content)
 
         # received an error status but no data with details on what failed
         if (info['status'] not in [200,304]) and (result is None):
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/eos/eos_eapi.py ansible-2.4.2.0/lib/ansible/modules/network/eos/eos_eapi.py
--- ansible-2.4.1.0/lib/ansible/modules/network/eos/eos_eapi.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/eos/eos_eapi.py	2017-11-29 21:10:32.000000000 +0000
@@ -260,11 +260,17 @@
         else:
             add('protocol unix-socket')
 
+    if needs_update('state') and not needs_update('vrf'):
+        if want['state'] == 'stopped':
+            add('shutdown')
+        elif want['state'] == 'started':
+            add('no shutdown')
+
 
     if needs_update('vrf'):
         add('vrf %s' % want['vrf'])
-
-    if needs_update('state'):
+        # switching operational vrfs here
+        # need to add the desired state as well
         if want['state'] == 'stopped':
             add('shutdown')
         elif want['state'] == 'started':
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/eos/eos_user.py ansible-2.4.2.0/lib/ansible/modules/network/eos/eos_user.py
--- ansible-2.4.1.0/lib/ansible/modules/network/eos/eos_user.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/eos/eos_user.py	2017-11-29 21:10:32.000000000 +0000
@@ -181,16 +181,16 @@
             commands.append('no username %s' % want['name'])
             continue
 
+        if needs_update('configured_password'):
+            if update_password == 'always' or not have:
+                add('secret %s' % want['configured_password'])
+
         if needs_update('role'):
             add('role %s' % want['role'])
 
         if needs_update('privilege'):
             add('privilege %s' % want['privilege'])
 
-        if needs_update('configured_password'):
-            if update_password == 'always' or not have:
-                add('secret %s' % want['configured_password'])
-
         if needs_update('sshkey'):
             add('sshkey %s' % want['sshkey'])
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/ios/ios_config.py ansible-2.4.2.0/lib/ansible/modules/network/ios/ios_config.py
--- ansible-2.4.1.0/lib/ansible/modules/network/ios/ios_config.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/ios/ios_config.py	2017-11-29 21:10:32.000000000 +0000
@@ -248,7 +248,7 @@
 
 - name: check the running-config against master config
   ios_config:
-    diff_config: intended
+    diff_against: intended
     intended_config: "{{ lookup('file', 'master.cfg') }}"
 
 - name: check the startup-config against the running-config
@@ -483,7 +483,7 @@
         if running_config.sha1 != startup_config.sha1 or module.params['save_when'] == 'always':
             result['changed'] = True
             if not module.check_mode:
-                run_commands(module, 'copy running-config startup-config')
+                run_commands(module, 'copy running-config startup-config\r')
             else:
                 module.warn('Skipping command `copy running-config startup-config` '
                             'due to check_mode.  Configuration not copied to '
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/ios/ios_logging.py ansible-2.4.2.0/lib/ansible/modules/network/ios/ios_logging.py
--- ansible-2.4.1.0/lib/ansible/modules/network/ios/ios_logging.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/ios/ios_logging.py	2017-11-29 21:10:32.000000000 +0000
@@ -38,7 +38,7 @@
   dest:
     description:
       - Destination of the logs.
-    choices: ['on', 'host', console', 'monitor', 'buffered']
+    choices: ['on', 'host', 'console', 'monitor', 'buffered']
   name:
     description:
       - If value of C(dest) is I(file) it indicates file-name,
@@ -48,6 +48,7 @@
     description:
       - Size of buffer. The acceptable value is in range from 4096 to
         4294967295 bytes.
+    default: 4096
   facility:
     description:
       - Set logging facility.
@@ -128,7 +129,7 @@
 
 def validate_size(value, module):
     if value:
-        if not int(4096) <= value <= int(4294967295):
+        if not int(4096) <= int(value) <= int(4294967295):
             module.fail_json(msg='size must be between 4096 and 4294967295')
         else:
             return value
@@ -148,43 +149,43 @@
 
         if state == 'absent' and w in have:
             if dest == 'host':
-                commands.append('no logging host {}'.format(name))
+                commands.append('no logging host {0}'.format(name))
             elif dest:
-                commands.append('no logging {}'.format(dest))
+                commands.append('no logging {0}'.format(dest))
             else:
                 module.fail_json(msg='dest must be among console, monitor, buffered, host, on')
 
             if facility:
-                commands.append('no logging facility {}'.format(facility))
+                commands.append('no logging facility {0}'.format(facility))
 
         if state == 'present' and w not in have:
             if facility:
-                commands.append('logging facility {}'.format(facility))
+                commands.append('logging facility {0}'.format(facility))
 
             if dest == 'host':
-                commands.append('logging host {}'.format(name))
+                commands.append('logging host {0}'.format(name))
 
             elif dest == 'on':
                 commands.append('logging on')
 
             elif dest == 'buffered' and size:
-                commands.append('logging buffered {}'.format(size))
+                commands.append('logging buffered {0}'.format(size))
 
             else:
-                dest_cmd = 'logging {}'.format(dest)
+                dest_cmd = 'logging {0}'.format(dest)
                 if level:
-                    dest_cmd += ' {}'.format(level)
+                    dest_cmd += ' {0}'.format(level)
 
                 commands.append(dest_cmd)
     return commands
 
 
-def parse_facility(line):
-    match = re.search(r'logging facility (\S+)', line, re.M)
-    if match:
-        facility = match.group(1)
-    else:
-        facility = 'local7'
+def parse_facility(line, dest):
+    facility = None
+    if dest == 'facility':
+        match = re.search(r'logging facility (\S+)', line, re.M)
+        if match:
+            facility = match.group(1)
 
     return facility
 
@@ -228,7 +229,7 @@
         level = 'debugging'
 
     else:
-        match = re.search(r'logging {} (\S+)'.format(dest), line, re.M)
+        match = re.search(r'logging {0} (\S+)'.format(dest), line, re.M)
         if match:
             if match.group(1) in level_group:
                 level = match.group(1)
@@ -242,9 +243,9 @@
 
 def map_config_to_obj(module):
     obj = []
-    dest_group = ('console', 'host', 'monitor', 'buffered', 'on')
+    dest_group = ('console', 'host', 'monitor', 'buffered', 'on', 'facility')
 
-    data = get_config(module, flags=['| section logging'])
+    data = get_config(module, flags=['| include logging'])
 
     for line in data.split('\n'):
         match = re.search(r'logging (\S+)', line, re.M)
@@ -256,10 +257,9 @@
                     'dest': dest,
                     'name': parse_name(line, dest),
                     'size': parse_size(line, dest),
-                    'facility': parse_facility(line),
+                    'facility': parse_facility(line, dest),
                     'level': parse_level(line, dest)
                 })
-
     return obj
 
 
@@ -332,7 +332,7 @@
         dest=dict(type='str', choices=['on', 'host', 'console', 'monitor', 'buffered']),
         name=dict(type='str'),
         size=dict(type='int'),
-        facility=dict(type='str', default='local7'),
+        facility=dict(type='str'),
         level=dict(type='str', default='debugging'),
         state=dict(default='present', choices=['present', 'absent']),
     )
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/ios/ios_system.py ansible-2.4.2.0/lib/ansible/modules/network/ios/ios_system.py
--- ansible-2.4.1.0/lib/ansible/modules/network/ios/ios_system.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/ios/ios_system.py	2017-11-29 21:10:32.000000000 +0000
@@ -266,12 +266,13 @@
     return matches
 
 def parse_name_servers(config):
-    match = re.findall('^ip name-server (?:vrf (\S+) )*(\S+)', config, re.M)
+    match = re.findall('^ip name-server (?:vrf (\S+) )*(.*)', config, re.M)
     matches = list()
-    for vrf, server in match:
+    for vrf, servers in match:
         if not vrf:
             vrf = None
-        matches.append({'server': server, 'vrf': vrf})
+        for server in servers.split():
+            matches.append({'server': server, 'vrf': vrf})
     return matches
 
 def parse_lookup_source(config):
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_banner.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_banner.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_banner.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_banner.py	2017-11-29 21:10:32.000000000 +0000
@@ -90,14 +90,17 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.nxos import load_config, run_commands
 from ansible.module_utils.nxos import nxos_argument_spec, check_args
+import re
 
 
 def map_obj_to_commands(want, have, module):
     commands = list()
     state = module.params['state']
+    platform_regex = 'Nexus.*Switch'
 
-    if (state == 'absent' and (have.get('text') and have.get('text') != 'User Access Verification')):
-        commands.append('no banner %s' % module.params['banner'])
+    if state == 'absent':
+        if (have.get('text') and not ((have.get('text') == 'User Access Verification') or re.match(platform_regex, have.get('text')))):
+            commands.append('no banner %s' % module.params['banner'])
 
     elif state == 'present' and want.get('text') != have.get('text'):
         banner_cmd = 'banner %s @\n%s\n@' % (module.params['banner'], want['text'].strip())
@@ -107,7 +110,11 @@
 
 
 def map_config_to_obj(module):
-    output = run_commands(module, ['show banner %s' % module.params['banner']])[0]
+    output = run_commands(module, ['show banner %s' % module.params['banner']], False)[0]
+
+    if "Invalid command" in output:
+        module.fail_json(msg="banner: exec may not be supported on this platform.  Possible values are : exec | motd")
+
     if isinstance(output, dict):
         output = list(output.values())[0]
 
@@ -148,6 +155,7 @@
                            supports_check_mode=True)
 
     warnings = list()
+
     check_args(module, warnings)
 
     result = {'changed': False}
@@ -155,7 +163,6 @@
         result['warnings'] = warnings
     want = map_params_to_obj(module)
     have = map_config_to_obj(module)
-
     commands = map_obj_to_commands(want, have, module)
     result['commands'] = commands
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_config.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_config.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_config.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_config.py	2017-11-29 21:10:32.000000000 +0000
@@ -273,6 +273,7 @@
 from ansible.module_utils.nxos import get_config, load_config, run_commands
 from ansible.module_utils.nxos import nxos_argument_spec
 from ansible.module_utils.nxos import check_args as nxos_check_args
+from ansible.module_utils.network_common import to_list
 
 
 def get_running_config(module, config=None):
@@ -296,6 +297,17 @@
     return candidate
 
 
+def execute_show_commands(module, commands, output='text'):
+    cmds = []
+    for command in to_list(commands):
+        cmd = { 'command': command,
+                'output': output,
+              }
+        cmds.append(cmd)
+    body = run_commands(module, cmds)
+    return body
+
+
 def main():
     """ main entry point for module execution
     """
@@ -396,7 +408,7 @@
         module.params['save_when'] = 'always'
 
     if module.params['save_when'] != 'never':
-        output = run_commands(module, ['show running-config', 'show startup-config'])
+        output = execute_show_commands(module, ['show running-config', 'show startup-config'])
 
         running_config = NetworkConfig(indent=1, contents=output[0], ignore_lines=diff_ignore_lines)
         startup_config = NetworkConfig(indent=1, contents=output[1], ignore_lines=diff_ignore_lines)
@@ -413,7 +425,7 @@
 
     if module._diff:
         if not running_config:
-            output = run_commands(module, 'show running-config')
+            output = execute_show_commands(module, 'show running-config')
             contents = output[0]
         else:
             contents = running_config.config_text
@@ -430,7 +442,7 @@
 
         elif module.params['diff_against'] == 'startup':
             if not startup_config:
-                output = run_commands(module, 'show startup-config')
+                output = execute_show_commands(module, 'show startup-config')
                 contents = output[0]
             else:
                 contents = output[0]
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_facts.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_facts.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_facts.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_facts.py	2017-11-29 21:10:32.000000000 +0000
@@ -171,7 +171,7 @@
 from ansible.module_utils.nxos import run_commands, get_config
 from ansible.module_utils.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.six import iteritems
+from ansible.module_utils.six import string_types, iteritems
 
 
 class FactsBase(object):
@@ -290,7 +290,7 @@
             self.facts['interfaces'] = self.populate_interfaces(data)
 
         data = self.run('show ipv6 interface', 'json')
-        if data:
+        if data and not isinstance(data, string_types):
             self.parse_ipv6_interfaces(data)
 
         data = self.run('show lldp neighbors')
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_igmp_snooping.py	2017-11-29 21:10:32.000000000 +0000
@@ -110,10 +110,10 @@
 from ansible.module_utils.basic import AnsibleModule
 
 
-def execute_show_command(command, module):
+def execute_show_command(command, module, output='text'):
     command = {
         'command': command,
-        'output': 'text',
+        'output': output,
     }
 
     return run_commands(module, [command])
@@ -130,11 +130,11 @@
 
 
 def get_group_timeout(config):
-    command = 'ip igmp snooping group-timeout'
-    REGEX = re.compile(r'(?:{0}\s)(?P<value>.*)$'.format(command), re.M)
-    value = ''
-    if command in config:
-        value = REGEX.search(config).group('value')
+    match = re.search(r'  Group timeout configured: (\S+)', config, re.M)
+    if match:
+        value = match.group(1)
+    else:
+        value = ''
     return value
 
 
@@ -150,33 +150,42 @@
 
 
 def get_igmp_snooping(module):
-    command = 'show run all | include igmp.snooping'
+    command = 'show ip igmp snooping'
     existing = {}
-    body = execute_show_command(command, module)[0]
 
-    if body:
-        split_body = body.splitlines()
+    try:
+        body = execute_show_command(command, module, output='json')[0]
+    except IndexError:
+        body = []
 
-        if 'no ip igmp snooping' in split_body:
-            existing['snooping'] = False
-        else:
+    if body:
+        snooping = str(body.get('enabled')).lower()
+        if snooping == 'true' or snooping == 'enabled':
             existing['snooping'] = True
+        else:
+            existing['snooping'] = False
 
-        if 'no ip igmp snooping report-suppression' in split_body:
-            existing['report_supp'] = False
-        elif 'ip igmp snooping report-suppression' in split_body:
+        report_supp = str(body.get('grepsup')).lower()
+        if report_supp == 'true' or report_supp == 'enabled':
             existing['report_supp'] = True
+        else:
+            existing['report_supp'] = False
 
-        if 'no ip igmp snooping link-local-groups-suppression' in split_body:
-            existing['link_local_grp_supp'] = False
-        elif 'ip igmp snooping link-local-groups-suppression' in split_body:
+        link_local_grp_supp = str(body.get('glinklocalgrpsup')).lower()
+        if link_local_grp_supp == 'true' or link_local_grp_supp == 'enabled':
             existing['link_local_grp_supp'] = True
+        else:
+            existing['link_local_grp_supp'] = False
 
-        if 'ip igmp snooping v3-report-suppression' in split_body:
+        v3_report_supp = str(body.get('gv3repsup')).lower()
+        if v3_report_supp == 'true' or v3_report_supp == 'enabled':
             existing['v3_report_supp'] = True
         else:
             existing['v3_report_supp'] = False
 
+    command = 'show ip igmp snooping'
+    body = execute_show_command(command, module)[0]
+    if body:
         existing['group_timeout'] = get_group_timeout(body)
 
     return existing
@@ -260,7 +269,6 @@
                     if value is not None)
 
     existing = get_igmp_snooping(module)
-    end_state = existing
 
     commands = []
     if state == 'present':
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_interface.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_interface.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_interface.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_interface.py	2017-11-29 21:10:32.000000000 +0000
@@ -275,75 +275,78 @@
     try:
         body = execute_show_command(command, module)[0]
     except IndexError:
-        body = []
-
+        return {}
     if body:
-        interface_table = body['TABLE_interface']['ROW_interface']
-        if interface_table.get('eth_mode') == 'fex-fabric':
-            module.fail_json(msg='nxos_interface does not support interfaces with mode "fex-fabric"')
-        intf_type = get_interface_type(intf)
-        if intf_type in ['portchannel', 'ethernet']:
-            if not interface_table.get('eth_mode'):
-                interface_table['eth_mode'] = 'layer3'
-
-        if intf_type == 'ethernet':
-            key_map.update(base_key_map)
-            key_map.update(mode_map)
-            temp_dict = apply_key_map(key_map, interface_table)
-            temp_dict = apply_value_map(mode_value_map, temp_dict)
-            interface.update(temp_dict)
-
-        elif intf_type == 'svi':
-            key_map.update(svi_map)
-            temp_dict = apply_key_map(key_map, interface_table)
-            interface.update(temp_dict)
-            attributes = get_manual_interface_attributes(intf, module)
-            interface['admin_state'] = str(attributes.get('admin_state',
-                                                          'nxapibug'))
-            interface['description'] = str(attributes.get('description',
-                                                          'nxapi_bug'))
-            command = 'show run interface {0}'.format(intf)
-            body = execute_show_command(command, module)[0]
-            if 'ip forward' in body:
-                interface['ip_forward'] = 'enable'
-            else:
-                interface['ip_forward'] = 'disable'
-            if 'fabric forwarding mode anycast-gateway' in body:
-                interface['fabric_forwarding_anycast_gateway'] = True
-            else:
-                interface['fabric_forwarding_anycast_gateway'] = False
-
-        elif intf_type == 'loopback':
-            key_map.update(base_key_map)
-            key_map.pop('admin_state')
-            key_map.update(loop_map)
-            temp_dict = apply_key_map(key_map, interface_table)
-            if not temp_dict.get('description'):
-                temp_dict['description'] = "None"
-            interface.update(temp_dict)
-
-        elif intf_type == 'management':
-            key_map.update(base_key_map)
-            temp_dict = apply_key_map(key_map, interface_table)
-            interface.update(temp_dict)
-
-        elif intf_type == 'portchannel':
-            key_map.update(base_key_map)
-            key_map.update(mode_map)
-            temp_dict = apply_key_map(key_map, interface_table)
-            temp_dict = apply_value_map(mode_value_map, temp_dict)
-            if not temp_dict.get('description'):
-                temp_dict['description'] = "None"
-            interface.update(temp_dict)
-
-        elif intf_type == 'nve':
-            key_map.update(base_key_map)
-            temp_dict = apply_key_map(key_map, interface_table)
-            if not temp_dict.get('description'):
-                temp_dict['description'] = "None"
-            interface.update(temp_dict)
+        try:
+            interface_table = body['TABLE_interface']['ROW_interface']
+        except KeyError:
+            return {}
+        if interface_table:
+            if interface_table.get('eth_mode') == 'fex-fabric':
+                module.fail_json(msg='nxos_interface does not support interfaces with mode "fex-fabric"')
+            intf_type = get_interface_type(intf)
+            if intf_type in ['portchannel', 'ethernet']:
+                if not interface_table.get('eth_mode'):
+                    interface_table['eth_mode'] = 'layer3'
+
+            if intf_type == 'ethernet':
+                key_map.update(base_key_map)
+                key_map.update(mode_map)
+                temp_dict = apply_key_map(key_map, interface_table)
+                temp_dict = apply_value_map(mode_value_map, temp_dict)
+                interface.update(temp_dict)
+
+            elif intf_type == 'svi':
+                key_map.update(svi_map)
+                temp_dict = apply_key_map(key_map, interface_table)
+                interface.update(temp_dict)
+                attributes = get_manual_interface_attributes(intf, module)
+                interface['admin_state'] = str(attributes.get('admin_state',
+                                                              'nxapibug'))
+                interface['description'] = str(attributes.get('description',
+                                                              'nxapi_bug'))
+                command = 'show run interface {0}'.format(intf)
+                body = execute_show_command(command, module)[0]
+                if 'ip forward' in body:
+                    interface['ip_forward'] = 'enable'
+                else:
+                    interface['ip_forward'] = 'disable'
+                if 'fabric forwarding mode anycast-gateway' in body:
+                    interface['fabric_forwarding_anycast_gateway'] = True
+                else:
+                    interface['fabric_forwarding_anycast_gateway'] = False
+
+            elif intf_type == 'loopback':
+                key_map.update(base_key_map)
+                key_map.pop('admin_state')
+                key_map.update(loop_map)
+                temp_dict = apply_key_map(key_map, interface_table)
+                if not temp_dict.get('description'):
+                    temp_dict['description'] = "None"
+                interface.update(temp_dict)
+
+            elif intf_type == 'management':
+                key_map.update(base_key_map)
+                temp_dict = apply_key_map(key_map, interface_table)
+                interface.update(temp_dict)
+
+            elif intf_type == 'portchannel':
+                key_map.update(base_key_map)
+                key_map.update(mode_map)
+                temp_dict = apply_key_map(key_map, interface_table)
+                temp_dict = apply_value_map(mode_value_map, temp_dict)
+                if not temp_dict.get('description'):
+                    temp_dict['description'] = "None"
+                interface.update(temp_dict)
+
+            elif intf_type == 'nve':
+                key_map.update(base_key_map)
+                temp_dict = apply_key_map(key_map, interface_table)
+                if not temp_dict.get('description'):
+                    temp_dict['description'] = "None"
+                interface.update(temp_dict)
 
-    interface['type'] = intf_type
+        interface['type'] = intf_type
 
     return interface
 
@@ -368,11 +371,11 @@
             keys.  Each value is a list of interfaces of given interface (key)
             type.
     """
-    command = 'show interface status'
+    command = 'show interface'
     try:
         body = execute_show_command(command, module)[0]
     except IndexError:
-        body = {}
+        return {}
 
     interfaces = {
         'ethernet': [],
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_portchannel.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_portchannel.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_portchannel.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_portchannel.py	2017-11-29 21:10:32.000000000 +0000
@@ -202,6 +202,8 @@
         for pc in pc_table:
             if pc['group'] == module.params['group']:
                 portchannel_table = pc
+            elif module.params['group'].isdigit() and pc['group'] == int(module.params['group']):
+                portchannel_table = pc
     except (KeyError, AttributeError, TypeError, IndexError):
         return {}
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_snmp_host.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_snmp_host.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_snmp_host.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_snmp_host.py	2017-11-29 21:10:32.000000000 +0000
@@ -102,6 +102,7 @@
 '''
 
 
+import re
 from ansible.module_utils.nxos import load_config, run_commands
 from ansible.module_utils.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
@@ -173,7 +174,9 @@
                 host_resource = apply_key_map(host_map, each)
 
                 if src:
-                    host_resource['src_intf'] = src.split(':')[1].strip()
+                    host_resource['src_intf'] = src
+                    if re.search(r'interface:', src):
+                        host_resource['src_intf'] = src.split(':')[1].strip()
 
                 vrf_filt = each.get('TABLE_vrf_filters')
                 if vrf_filt:
@@ -199,7 +202,9 @@
                     host_resource = apply_key_map(host_map_5k, each)
 
                     if src:
-                        host_resource['src_intf'] = src.split(':')[1].strip()
+                        host_resource['src_intf'] = src
+                        if re.search(r'interface:', src):
+                            host_resource['src_intf'] = src.split(':')[1].strip()
 
                     vrf_filt = each.get('TABLE_filter_vrf')
                     if vrf_filt:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_snmp_location.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_snmp_location.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_snmp_location.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_snmp_location.py	2017-11-29 21:10:32.000000000 +0000
@@ -96,7 +96,7 @@
 
 def get_snmp_location(module):
     location = {}
-    location_regex = r'^\s*snmp-server\slocation\s(?P<location>.+)$'
+    location_regex = r'^\s*snmp-server\s+location\s+(?P<location>.+)$'
 
     body = execute_show_command('show run snmp', module)[0]
     match_location = re.search(location_regex, body, re.M)
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_snmp_user.py ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_snmp_user.py
--- ansible-2.4.1.0/lib/ansible/modules/network/nxos/nxos_snmp_user.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/nxos/nxos_snmp_user.py	2017-11-29 21:10:32.000000000 +0000
@@ -139,23 +139,41 @@
 
     resource = {}
     try:
-        resource_table = body[0]['TABLE_snmp_users']['ROW_snmp_users']
+        # The TABLE and ROW keys differ between NXOS platforms.
+        if body[0].get('TABLE_snmp_user'):
+            tablekey = 'TABLE_snmp_user'
+            rowkey = 'ROW_snmp_user'
+            tablegrpkey = 'TABLE_snmp_group_names'
+            rowgrpkey = 'ROW_snmp_group_names'
+            authkey = 'auth_protocol'
+            privkey = 'priv_protocol'
+            grpkey = 'group_names'
+        elif body[0].get('TABLE_snmp_users'):
+            tablekey = 'TABLE_snmp_users'
+            rowkey = 'ROW_snmp_users'
+            tablegrpkey = 'TABLE_groups'
+            rowgrpkey = 'ROW_groups'
+            authkey = 'auth'
+            privkey = 'priv'
+            grpkey = 'group'
+
+        resource_table = body[0][tablekey][rowkey]
         resource['user'] = str(resource_table['user'])
-        resource['authentication'] = str(resource_table['auth']).strip()
-        encrypt = str(resource_table['priv']).strip()
+        resource['authentication'] = str(resource_table[authkey]).strip()
+        encrypt = str(resource_table[privkey]).strip()
         if encrypt.startswith('aes'):
             resource['encrypt'] = 'aes-128'
         else:
             resource['encrypt'] = 'none'
 
-        group_table = resource_table['TABLE_groups']['ROW_groups']
+        group_table = resource_table[tablegrpkey][rowgrpkey]
 
         groups = []
         try:
             for group in group_table:
-                groups.append(str(group['group']).strip())
+                groups.append(str(group[grpkey]).strip())
         except TypeError:
-            groups.append(str(group_table['group']).strip())
+            groups.append(str(group_table[grpkey]).strip())
 
         resource['group'] = groups
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/network/panos/panos_security_rule.py ansible-2.4.2.0/lib/ansible/modules/network/panos/panos_security_rule.py
--- ansible-2.4.1.0/lib/ansible/modules/network/panos/panos_security_rule.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/network/panos/panos_security_rule.py	2017-11-29 21:10:32.000000000 +0000
@@ -16,10 +16,10 @@
 ---
 module: panos_security_rule
 short_description: Create security rule policy on PAN-OS devices or Panorama management console.
-description: >
-    - Security policies allow you to enforce rules and take action, and can be as general or specific as needed. The
-    policy rules are compared against the incoming traffic in sequence, and because the first rule that matches the
-    traffic is applied, the more specific rules must precede the more general ones.
+description:
+    - Security policies allow you to enforce rules and take action, and can be as general or specific as needed.
+      The policy rules are compared against the incoming traffic in sequence, and because the first rule that matches the traffic is applied,
+      the more specific rules must precede the more general ones.
 author: "Ivan Bojer (@ivanbojer), Robert Hagen (@rnh556)"
 version_added: "2.4"
 requirements:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/packaging/os/apt.py ansible-2.4.2.0/lib/ansible/modules/packaging/os/apt.py
--- ansible-2.4.1.0/lib/ansible/modules/packaging/os/apt.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/packaging/os/apt.py	2017-11-29 21:10:32.000000000 +0000
@@ -720,7 +720,13 @@
 
 def upgrade(m, mode="yes", force=False, default_release=None,
             use_apt_get=False,
-            dpkg_options=expand_dpkg_options(DPKG_OPTIONS)):
+            dpkg_options=expand_dpkg_options(DPKG_OPTIONS), autoremove=None):
+
+    if autoremove:
+        autoremove = '--auto-remove'
+    else:
+        autoremove = ''
+
     if m.check_mode:
         check_arg = '--simulate'
     else:
@@ -739,7 +745,7 @@
     else:
         if use_apt_get:
             apt_cmd = APT_GET_CMD
-            upgrade_command = "upgrade --with-new-pkgs --autoremove"
+            upgrade_command = "upgrade --with-new-pkgs %s" % (autoremove)
         else:
             # aptitude safe-upgrade # mode=yes # default
             apt_cmd = APTITUDE_CMD
@@ -973,7 +979,7 @@
         force_yes = p['force']
 
         if p['upgrade']:
-            upgrade(module, p['upgrade'], force_yes, p['default_release'], use_apt_get, dpkg_options)
+            upgrade(module, p['upgrade'], force_yes, p['default_release'], use_apt_get, dpkg_options, autoremove)
 
         if p['deb']:
             if p['state'] != 'present':
@@ -993,7 +999,7 @@
         if latest and all_installed:
             if packages:
                 module.fail_json(msg='unable to install additional packages when ugrading all installed packages')
-            upgrade(module, 'yes', force_yes, p['default_release'], use_apt_get, dpkg_options)
+            upgrade(module, 'yes', force_yes, p['default_release'], use_apt_get, dpkg_options, autoremove)
 
         if packages:
             for package in packages:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/packaging/os/package.py ansible-2.4.2.0/lib/ansible/modules/packaging/os/package.py
--- ansible-2.4.1.0/lib/ansible/modules/packaging/os/package.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/packaging/os/package.py	2017-11-29 21:10:32.000000000 +0000
@@ -32,7 +32,7 @@
     required: true
   state:
     description:
-      - Whether to install (C(present), C(latest)), or remove (C(absent)) a package.
+      - Whether to install (C(present), or remove (C(absent)) a package. Other states depend on the underlying package module, i.e C(latest).
     required: true
   use:
     description:
@@ -47,10 +47,10 @@
     - For Windows targets, use the M(win_package) module instead.
 '''
 EXAMPLES = '''
-- name: install the latest version of ntpdate
+- name: install ntpdate
   package:
     name: ntpdate
-    state: latest
+    state: present
 
 # This uses a variable as this changes per distribution.
 - name: remove the apache package
diff -Nru ansible-2.4.1.0/lib/ansible/modules/packaging/os/yum.py ansible-2.4.2.0/lib/ansible/modules/packaging/os/yum.py
--- ansible-2.4.1.0/lib/ansible/modules/packaging/os/yum.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/packaging/os/yum.py	2017-11-29 21:10:32.000000000 +0000
@@ -1111,7 +1111,8 @@
         res['changed'] = True
     elif len(pkgs['install']) or len(will_update):
         cmd = yum_basecmd + ['install'] + pkgs['install'] + pkgs['update']
-        rc, out, err = module.run_command(cmd)
+        lang_env = dict(LANG='C', LC_ALL='C', LC_MESSAGES='C')
+        rc, out, err = module.run_command(cmd, environ_update=lang_env)
         out_lower = out.strip().lower()
         if not out_lower.endswith("no packages marked for update") and \
                 not out_lower.endswith("nothing to do"):
diff -Nru ansible-2.4.1.0/lib/ansible/modules/source_control/git.py ansible-2.4.2.0/lib/ansible/modules/source_control/git.py
--- ansible-2.4.1.0/lib/ansible/modules/source_control/git.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/source_control/git.py	2017-11-29 21:10:32.000000000 +0000
@@ -118,6 +118,8 @@
         version_added: "1.2"
         description:
             - If C(no), do not retrieve new revisions from the origin repository
+            - Operations like archive will work on the existing (old) repository and might
+              not respond to changes to the options version or remote.
     executable:
         required: false
         default: null
@@ -1090,6 +1092,15 @@
         # requested.
         result['before'] = get_version(module, git_path, dest)
         result.update(after=result['before'])
+        if archive:
+            # Git archive is not supported by all git servers, so
+            # we will first clone and perform git archive from local directory
+            if module.check_mode:
+                result.update(changed=True)
+                module.exit_json(**result)
+
+            create_archive(git_path, module, dest, archive, version, repo, result)
+
         module.exit_json(**result)
     else:
         # else do a pull
diff -Nru ansible-2.4.1.0/lib/ansible/modules/system/firewalld.py ansible-2.4.2.0/lib/ansible/modules/system/firewalld.py
--- ansible-2.4.1.0/lib/ansible/modules/system/firewalld.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/system/firewalld.py	2017-11-29 21:10:32.000000000 +0000
@@ -169,7 +169,7 @@
         fw.start()
         fw_offline = True
 
-except ImportError as e:
+except ImportError:
     import_failure = True
 
 
@@ -751,8 +751,7 @@
 
     if import_failure:
         module.fail_json(
-            msg='firewalld and its python 2 module are required for this module, version 2.0.11 or newer required (3.0.9 or newer for offline operations) \n %s'
-            % e
+            msg='firewalld and its python 2 module are required for this module, version 2.0.11 or newer required (3.0.9 or newer for offline operations)'
         )
 
     if fw_offline:
diff -Nru ansible-2.4.1.0/lib/ansible/modules/system/user.py ansible-2.4.2.0/lib/ansible/modules/system/user.py
--- ansible-2.4.1.0/lib/ansible/modules/system/user.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/system/user.py	2017-11-29 21:10:32.000000000 +0000
@@ -420,7 +420,8 @@
             cmd.append(self.password)
 
         if self.createhome:
-            cmd.append('-m')
+            if not self.local:
+                cmd.append('-m')
 
             if self.skeleton is not None:
                 cmd.append('-k')
diff -Nru ansible-2.4.1.0/lib/ansible/modules/utilities/logic/wait_for.py ansible-2.4.2.0/lib/ansible/modules/utilities/logic/wait_for.py
--- ansible-2.4.1.0/lib/ansible/modules/utilities/logic/wait_for.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/utilities/logic/wait_for.py	2017-11-29 21:10:32.000000000 +0000
@@ -168,6 +168,7 @@
 
 import binascii
 import datetime
+import errno
 import math
 import os
 import re
@@ -558,15 +559,27 @@
                                 break
 
                         # Shutdown the client socket
-                        s.shutdown(socket.SHUT_RDWR)
-                        s.close()
+                        try:
+                            s.shutdown(socket.SHUT_RDWR)
+                        except socket.error as e:
+                            if e.errno != errno.ENOTCONN:
+                                raise
+                        # else, the server broke the connection on its end, assume it's not ready
+                        else:
+                            s.close()
                         if matched:
                             # Found our string, success!
                             break
                     else:
                         # Connection established, success!
-                        s.shutdown(socket.SHUT_RDWR)
-                        s.close()
+                        try:
+                            s.shutdown(socket.SHUT_RDWR)
+                        except socket.error as e:
+                            if e.errno != errno.ENOTCONN:
+                                raise
+                        # else, the server broke the connection on its end, assume it's not ready
+                        else:
+                            s.close()
                         break
 
             # Conditions not yet met, wait and try again
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_chocolatey.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_chocolatey.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_chocolatey.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_chocolatey.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -39,10 +39,6 @@
     changed = $false
 }
 
-if ($source) {
-    $source = $source.Tolower()
-}
-
 if ($upgrade)
 {
     Add-DeprecationWarning -obj $result -message "Parameter upgrade=yes is replaced with state=latest" -version 2.6
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_find.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_find.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_find.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_find.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -1,21 +1,10 @@
 #!powershell
 # This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# WANT_JSON
-# POWERSHELL_COMMON
+# Copyright (c) 2016 Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+#Requires -Module Ansible.ModuleUtils.Legacy
 
 $ErrorActionPreference = "Stop"
 
@@ -23,21 +12,20 @@
 
 $paths = Get-AnsibleParam -obj $params -name 'paths' -failifempty $true
 
-$age = Get-AnsibleParam -obj $params -name 'age' -failifempty $false -default $null
-$age_stamp = Get-AnsibleParam -obj $params -name 'age_stamp' -failifempty $false -default 'mtime' -ValidateSet 'mtime','ctime','atime'
-$file_type = Get-AnsibleParam -obj $params -name 'file_type' -failifempty $false -default 'file' -ValidateSet 'file','directory'
-$follow = Get-AnsibleParam -obj $params -name 'follow' -type "bool" -failifempty $false -default $false
-$hidden = Get-AnsibleParam -obj $params -name 'hidden' -type "bool" -failifempty $false -default $false
-$patterns = Get-AnsibleParam -obj $params -name 'patterns' -failifempty $false -default $null
-$recurse = Get-AnsibleParam -obj $params -name 'recurse' -type "bool" -failifempty $false -default $false
-$size = Get-AnsibleParam -obj $params -name 'size' -failifempty $false -default $null
-$use_regex = Get-AnsibleParam -obj $params -name 'use_regex' -type "bool" -failifempty $false -default $false
-$get_checksum = Get-AnsibleParam -obj $params -name 'get_checksum' -type "bool" -failifempty $false -default $true
-$checksum_algorithm = Get-AnsibleParam -obj $params -name 'checksum_algorithm' -failifempty $false -default 'sha1' -ValidateSet 'md5', 'sha1', 'sha256', 'sha384', 'sha512'
+$age = Get-AnsibleParam -obj $params -name 'age'
+$age_stamp = Get-AnsibleParam -obj $params -name 'age_stamp' -default 'mtime' -ValidateSet 'mtime','ctime','atime'
+$file_type = Get-AnsibleParam -obj $params -name 'file_type' -default 'file' -ValidateSet 'file','directory'
+$follow = Get-AnsibleParam -obj $params -name 'follow' -type "bool" -default $false
+$hidden = Get-AnsibleParam -obj $params -name 'hidden' -type "bool" -default $false
+$patterns = Get-AnsibleParam -obj $params -name 'patterns'
+$recurse = Get-AnsibleParam -obj $params -name 'recurse' -type "bool" -default $false
+$size = Get-AnsibleParam -obj $params -name 'size'
+$use_regex = Get-AnsibleParam -obj $params -name 'use_regex' -type "bool" -default $false
+$get_checksum = Get-AnsibleParam -obj $params -name 'get_checksum' -type "bool" -default $true
+$checksum_algorithm = Get-AnsibleParam -obj $params -name 'checksum_algorithm' -default 'sha1' -ValidateSet 'md5', 'sha1', 'sha256', 'sha384', 'sha512'
 
 $result = @{
     files = @()
-    warnings = @()
     examined = 0
     matched = 0
     changed = $false
@@ -121,7 +109,7 @@
                 }
             }
         } else {
-            Fail-Json $result "failed to process age"
+            throw "failed to process age for file $($info.FullName)"
         }
     }
 
@@ -204,7 +192,7 @@
                 }
             }
         } else {
-            Fail-Json $result "failed to process size"
+            throw "failed to process size for file $($info.FullName)"
         }
     }
 
@@ -282,8 +270,12 @@
         $file_stat.extension = $file.Extension
 
         if ($get_checksum) {
-            $checksum = Get-FileChecksum -path $path -algorithm $checksum_algorithm
-            $file_stat.checksum = $checksum
+            try {
+                $checksum = Get-FileChecksum -path $path -algorithm $checksum_algorithm
+                $file_stat.checksum = $checksum
+            } catch {
+                throw "failed to get checksum for file $($file.FullName)"
+            }
         }
     }
 
@@ -329,8 +321,14 @@
 $paths_to_check = $paths_to_check | Select-Object -Unique
 
 foreach ($path in $paths_to_check) {
-    $file = Get-Item -Force -Path $path
-    $info = Get-FileStat -file $file
+    try {
+        $file = Get-Item -Force -Path $path
+        $info = Get-FileStat -file $file
+    } catch {
+        Add-Warning -obj $result -message "win_find failed to check some files, these files were ignored and will not be part of the result output"
+        break
+    }
+
     $new_examined = $result.examined + 1
     $result.examined = $new_examined
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_find.py ansible-2.4.2.0/lib/ansible/modules/windows/win_find.py
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_find.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_find.py	2017-11-29 21:10:32.000000000 +0000
@@ -1,23 +1,11 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-# (c) 2016, Ansible, inc
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
+# Copyright (c) 2016 Ansible Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+# this is a windows documentation stub.  actual code lives in the .ps1
+# file of the same name
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['preview'],
@@ -27,7 +15,7 @@
 ---
 module: win_find
 version_added: "2.3"
-short_description: return a list of files based on specific criteria
+short_description: Return a list of files based on specific criteria
 description:
     - Return a list of files based on specified criteria.
     - Multiple criteria are AND'd together.
@@ -40,45 +28,38 @@
               less than the specified time. You can choose seconds, minutes,
               hours, days or weeks by specifying the first letter of an of
               those words (e.g., "2s", "10d", 1w").
-        required: false
     age_stamp:
         description:
             - Choose the file property against which we compare C(age). The
               default attribute we compare with is the last modification time.
-        required: false
         default: mtime
         choices: ['atime', 'mtime', 'ctime']
     checksum_algorithm:
         description:
             - Algorithm to determine the checksum of a file. Will throw an error
               if the host is unable to use specified algorithm.
-        required: false
         default: sha1
         choices: ['md5', 'sha1', 'sha256', 'sha384', 'sha512']
     file_type:
-        description: Type of file to search for
-        required: false
+        description: Type of file to search for.
         default: file
         choices: ['file', 'directory']
     follow:
         description:
             - Set this to true to follow symlinks in the path. This needs to
               be used in conjunction with C(recurse).
-        required: false
-        default: false
-        choices: ['true', 'false']
+        type: bool
+        default: 'no'
     get_checksum:
         description:
             - Whether to return a checksum of the file in the return info (default sha1),
               use C(checksum_algorithm) to change from the default.
-        required: false
-        default: true
-        choices: ['true', 'false']
+        type: bool
+        default: 'yes'
     hidden:
-        description: Set this to include hidden files or folders
-        required: false
-        default: false
-        choices: ['true', 'false']
+        description: Set this to include hidden files or folders.
+        type: bool
+        default: 'no'
     paths:
         description:
             - List of paths of directories to search for files or folders in.
@@ -91,14 +72,12 @@
               option. The patterns retrict the list of files or folders to be
               returned based on the filenames. For a file to be matched it
               only has to match with one pattern in a list provided.
-        required: false
     recurse:
         description:
             - Will recursively descend into the directory looking for files
-              or folders
-        required: false
-        default: false
-        choices: ['true', 'false']
+              or folders.
+        type: bool
+        default: 'no'
     size:
         description:
             - Select files or folders whose size is equal to or greater than
@@ -106,123 +85,114 @@
               or less than the specified size. You can specify the size with
               a suffix of the byte type i.e. kilo = k, mega = m... Size is not
               evaluated for symbolic links.
-        required: false
-        default: false
     use_regex:
         description:
-            - Will set patterns to run as a regex check if true
-        required: false
-        default: false
-        choices: ['true', 'false']
-notes:
-    - For non-Windows targets, use the M(find) module instead.
-author: "Jordan Borean (@jborean93)"
+            - Will set patterns to run as a regex check if true.
+        type: bool
+        default: 'no'
+author:
+- Jordan Borean (@jborean93)
 '''
 
 EXAMPLES = r'''
-# Find files in path
-- win_find:
+- name: Find files in path
+  win_find:
     paths: D:\temp
 
-# Find hidden files in path
-- win_find:
+- name: Find hidden files in path
+  win_find:
     paths: D:\temp
     hidden: True
 
-# Find files in multiple paths
-- win_find:
+- name: Find files in multiple paths
+  win_find:
     paths: ['C:\temp', 'D:\temp']
 
-# Find files in directory while searching recursively
-- win_find:
+- name: Find files in directory while searching recursively
+  win_find:
     paths: D:\temp
     recurse: True
 
-# Find files in directory while following symlinks
-- win_find:
+- name: Find files in directory while following symlinks
+  win_find:
     paths: D:\temp
     recurse: True
     follow: True
 
-# Find files with .log and .out extension using powershell wildcards
-- win_find:
+- name: Find files with .log and .out extension using powershell wildcards
+  win_find:
     paths: D:\temp
     patterns: ['*.log', '*.out']
 
-# Find files in path based on regex pattern
-- win_find:
+- name: Find files in path based on regex pattern
+  win_find:
     paths: D:\temp
     patterns: 'out_\d{8}-\d{6}.log'
 
-# Find files older than 1 day
-- win_find:
+- name: Find files older than 1 day
+  win_find:
     paths: D:\temp
     age: 86400
 
-# Find files older than 1 day based on create time
-- win_find:
+- name: Find files older than 1 day based on create time
+  win_find:
     paths: D:\temp
     age: 86400
     age_stamp: ctime
 
-# Find files older than 1 day with unit syntax
-- win_find:
+- name: Find files older than 1 day with unit syntax
+  win_find:
     paths: D:\temp
     age: 1d
 
-# Find files newer than 1 hour
-- win_find:
+- name: Find files newer than 1 hour
+  win_find:
     paths: D:\temp
     age: -3600
 
-# Find files newer than 1 hour with unit syntax
-- win_find:
+- name: Find files newer than 1 hour with unit syntax
+  win_find:
     paths: D:\temp
     age: -1h
 
-# Find files larger than 1MB
-- win_find:
+- name: Find files larger than 1MB
+  win_find:
     paths: D:\temp
     size: 1048576
 
-# Find files larger than 1GB with unit syntax
-- win_find:
+- name: Find files larger than 1GB with unit syntax
+  win_find:
     paths: D:\temp
     size: 1g
 
-# Find files smaller than 1MB
-- win_find:
+- name: Find files smaller than 1MB
+  win_find:
     paths: D:\temp
     size: -1048576
 
-# Find files smaller than 1GB with unit syntax
-- win_find:
+- name: Find files smaller than 1GB with unit syntax
+  win_find:
     paths: D:\temp
     size: -1g
 
-# Find folders/symlinks in multiple paths
-- win_find:
+- name: Find folders/symlinks in multiple paths
+  win_find:
     paths: ['C:\temp', 'D:\temp']
     file_type: directory
 
-# Find files and return SHA256 checksum of files found
-- win_find:
+- name: Find files and return SHA256 checksum of files found
+  win_find:
     paths: C:\temp
     get_checksum: True
     checksum_algorithm: sha256
 
-# Find files and do not return the checksum
-- win_find:
+- name: Find files and do not return the checksum
+  win_find:
     path: C:\temp
     get_checksum: False
 '''
 
 RETURN = r'''
-changed:
-    description: Whether anything was chagned
-    returned: always
-    type: boolean
-    sample: True
 examined:
     description: The number of files/folders that was checked
     returned: always
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_iis_virtualdirectory.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_iis_virtualdirectory.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_iis_virtualdirectory.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_iis_virtualdirectory.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -26,13 +26,13 @@
 # Name parameter
 $name = Get-Attr $params "name" $FALSE;
 If ($name -eq $FALSE) {
-    Fail-Json (New-Object psobject) "missing required argument: name";
+    Fail-Json @{} "missing required argument: name";
 }
 
 # Site
 $site = Get-Attr $params "site" $FALSE;
 If ($site -eq $FALSE) {
-    Fail-Json (New-Object psobject) "missing required argument: site";
+    Fail-Json @{} "missing required argument: site";
 }
 
 # Application
@@ -53,8 +53,8 @@
 }
 
 # Result
-$result = New-Object psobject @{
-  directory = New-Object psobject
+$result = @{
+  directory = @{}
   changed = $false
 };
 
@@ -76,13 +76,13 @@
   # Add directory
   If(($state -eq 'present') -and (-not $directory)) {
     If ($physical_path -eq $FALSE) {
-      Fail-Json (New-Object psobject) "missing required arguments: physical_path"
+      Fail-Json @{} "missing required arguments: physical_path"
     }
     If (-not (Test-Path $physical_path)) {
-      Fail-Json (New-Object psobject) "specified folder must already exist: physical_path"
+      Fail-Json @{} "specified folder must already exist: physical_path"
     }
 
-    $directory_parameters = New-Object psobject @{
+    $directory_parameters = @{
       Site = $site
       Name = $name
       PhysicalPath = $physical_path
@@ -108,7 +108,7 @@
     # Change Physical Path if needed
     if($physical_path) {
       If (-not (Test-Path $physical_path)) {
-        Fail-Json (New-Object psobject) "specified folder must already exist: physical_path"
+        Fail-Json @{} "specified folder must already exist: physical_path"
       }
 
       $vdir_folder = Get-Item $directory.PhysicalPath
@@ -125,7 +125,7 @@
 
 # Result
 $directory = Get-WebVirtualDirectory -Site $site -Name $name
-$result.directory = New-Object psobject @{
+$result.directory = @{
   PhysicalPath = $directory.PhysicalPath
 }
 
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_iis_webbinding.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_iis_webbinding.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_iis_webbinding.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_iis_webbinding.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -32,7 +32,7 @@
 $certificatehash = Get-AnsibleParam $params -name "certificate_hash" -default $false
 $certificateStoreName = Get-AnsibleParam $params -name "certificate_store_name" -default "MY"
 
-$binding_parameters = New-Object psobject @{
+$binding_parameters = @{
   Name = $name
 };
 
@@ -58,7 +58,7 @@
 }
 
 function Create-Binding-Info {
-  return New-Object psobject @{
+  return @{
     "bindingInformation" = $args[0].bindingInformation
     "certificateHash" = $args[0].certificateHash
     "certificateStoreName" = $args[0].certificateStoreName
@@ -69,7 +69,7 @@
 }
 
 # Result
-$result = New-Object psobject @{
+$result = @{
   changed = $false
   parameters = $binding_parameters
   matched = @()
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_iis_website.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_iis_website.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_iis_website.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_iis_website.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -25,14 +25,14 @@
 # Name parameter
 $name = Get-Attr $params "name" $FALSE;
 If ($name -eq $FALSE) {
-    Fail-Json (New-Object psobject) "missing required argument: name";
+    Fail-Json @{} "missing required argument: name";
 }
 
 # State parameter
 $state = Get-Attr $params "state" $FALSE;
 $state.ToString().ToLower();
 If (($state -ne $FALSE) -and ($state -ne 'started') -and ($state -ne 'stopped') -and ($state -ne 'restarted') -and ($state -ne 'absent')) {
-  Fail-Json (New-Object psobject) "state is '$state'; must be 'started', 'restarted', 'stopped' or 'absent'"
+  Fail-Json @{} "state is '$state'; must be 'started', 'restarted', 'stopped' or 'absent'"
 }
 
 # Path parameter
@@ -65,8 +65,8 @@
 }
 
 # Result
-$result = New-Object psobject @{
-  site = New-Object psobject
+$result = @{
+  site = @{}
   changed = $false
 };
 
@@ -77,13 +77,13 @@
   # Add site
   If(($state -ne 'absent') -and (-not $site)) {
     If ($physical_path -eq $FALSE) {
-      Fail-Json (New-Object psobject) "missing required arguments: physical_path"
+      Fail-Json @{} "missing required arguments: physical_path"
     }
     ElseIf (-not (Test-Path $physical_path)) {
-      Fail-Json (New-Object psobject) "specified folder must already exist: physical_path"
+      Fail-Json @{} "specified folder must already exist: physical_path"
     }
 
-    $site_parameters = New-Object psobject @{
+    $site_parameters = @{
       Name = $name
       PhysicalPath = $physical_path
     };
@@ -129,7 +129,7 @@
     # Change Physical Path if needed
     if($physical_path) {
       If (-not (Test-Path $physical_path)) {
-        Fail-Json (New-Object psobject) "specified folder must already exist: physical_path"
+        Fail-Json @{} "specified folder must already exist: physical_path"
       }
 
       $folder = Get-Item $physical_path
@@ -173,7 +173,7 @@
 }
 Catch
 {
-  Fail-Json (New-Object psobject) $_.Exception.Message
+  Fail-Json @{} $_.Exception.Message
 }
 
 if ($state -ne 'absent')
@@ -183,7 +183,7 @@
 
 if ($site)
 {
-  $result.site = New-Object psobject @{
+  $result.site = @{
     Name = $site.Name
     ID = $site.ID
     State = $site.State
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_package.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_package.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_package.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_package.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -36,6 +36,16 @@
     [System.Net.ServicePointManager]::ServerCertificateValidationCallback = { $true }
 }
 
+# Enable TLS1.1/TLS1.2 if they're available but disabled (eg. .NET 4.5)
+$security_protcols = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::SystemDefault
+if ([Net.SecurityProtocolType].GetMember("Tls11").Count -gt 0) {
+    $security_protcols = $security_protcols -bor [Net.SecurityProtocolType]::Tls11
+}
+if ([Net.SecurityProtocolType].GetMember("Tls12").Count -gt 0) {
+    $security_protcols = $security_protcols -bor [Net.SecurityProtocolType]::Tls12
+}
+[Net.ServicePointManager]::SecurityProtocol = $security_protcols
+
 $credential = $null
 if ($username -ne $null) {
     $sec_user_password = ConvertTo-SecureString -String $password -AsPlainText -Force
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_region.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_region.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_region.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_region.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -102,7 +102,7 @@
 
     $lookup = New-Object Ansible.LocaleHelper($culture)
     # hex values are from http://www.pinvoke.net/default.aspx/kernel32/GetLocaleInfoEx.html
-    $wanted_values = New-Object PSObject @{
+    $wanted_values = @{
         Locale = '{0:x8}' -f ([System.Globalization.CultureInfo]$culture).LCID
         LocaleName = $culture
         s1159 = $lookup.GetValueFromType(0x00000028)
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_reg_stat.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_reg_stat.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_reg_stat.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_reg_stat.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -69,7 +69,7 @@
         $raw_value = $value
     }
 
-    $object = New-Object PSObject @{
+    $object = @{
         raw_value = $raw_value
         value = $value
         type = $type
diff -Nru ansible-2.4.1.0/lib/ansible/modules/windows/win_service.ps1 ansible-2.4.2.0/lib/ansible/modules/windows/win_service.ps1
--- ansible-2.4.1.0/lib/ansible/modules/windows/win_service.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/modules/windows/win_service.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -32,7 +32,7 @@
 $force_dependent_services = Get-AnsibleParam -obj $params -name 'force_dependent_services' -type 'bool' -default $false
 $name = Get-AnsibleParam -obj $params -name 'name' -type 'str' -failifempty $true
 $password = Get-AnsibleParam -obj $params -name 'password' -type 'str'
-$path = Get-AnsibleParam -obj $params -name 'path' -type 'path'
+$path = Get-AnsibleParam -obj $params -name 'path'
 $start_mode = Get-AnsibleParam -obj $params -name 'start_mode' -type 'str' -validateset 'auto','manual','disabled','delayed'
 $state = Get-AnsibleParam -obj $params -name 'state' -type 'str' -validateset 'started','stopped','restarted','absent','paused'
 $username = Get-AnsibleParam -obj $params -name 'username' -type 'str'
@@ -51,6 +51,9 @@
 if ($desktop_interact -eq $true -and (-not ($username -eq "LocalSystem" -or $username -eq $null))) {
     Fail-Json $result "Can only set 'desktop_interact' to true when 'username' equals 'LocalSystem'"
 }
+if ($path -ne $null) {
+    $path = [System.Environment]::ExpandEnvironmentVariables($path)
+}
 
 Function Get-ServiceInfo($name) {
     # Need to get new objects so we have the latest info
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/asa.py ansible-2.4.2.0/lib/ansible/module_utils/asa.py
--- ansible-2.4.1.0/lib/ansible/module_utils/asa.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/asa.py	2017-11-29 21:10:31.000000000 +0000
@@ -33,7 +33,7 @@
 _DEVICE_CONFIGS = {}
 _CONNECTION = None
 
-asa_argument_spec = {
+asa_provider_spec = {
     'host': dict(),
     'port': dict(type='int'),
     'username': dict(fallback=(env_fallback, ['ANSIBLE_NET_USERNAME'])),
@@ -42,11 +42,15 @@
     'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
     'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
     'timeout': dict(type='int'),
-    'provider': dict(type='dict'),
     'context': dict(),
     'passwords': dict()
 }
 
+asa_argument_spec = {
+    'provider': dict(type='dict', options=asa_provider_spec),
+}
+asa_argument_spec.update(asa_provider_spec)
+
 command_spec = {
     'command': dict(key=True),
     'prompt': dict(),
@@ -59,17 +63,10 @@
 
 
 def check_args(module):
-    provider = module.params['provider'] or {}
-
     for key in asa_argument_spec:
         if key not in ['context', 'passwords', 'provider', 'authorize'] and module.params[key]:
             module.warn('argument %s has been deprecated and will be removed in a future version' % key)
 
-    if provider:
-        for param in ('auth_pass', 'password'):
-            if provider.get(param):
-                module.no_log_values.update(return_values(provider[param]))
-
 
 def get_connection(module):
     global _CONNECTION
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/azure_rm_common.py ansible-2.4.2.0/lib/ansible/module_utils/azure_rm_common.py
--- ansible-2.4.1.0/lib/ansible/module_utils/azure_rm_common.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/azure_rm_common.py	2017-11-29 21:10:31.000000000 +0000
@@ -31,6 +31,10 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six.moves import configparser
 import ansible.module_utils.six.moves.urllib.parse as urlparse
+try:
+    from ansible.release import __version__ as ANSIBLE_VERSION
+except ImportError:
+    ANSIBLE_VERSION = 'unknown'
 
 AZURE_COMMON_ARGS = dict(
     cli_default_profile=dict(type='bool'),
@@ -66,7 +70,8 @@
     ('log_mode', 'file', ['log_path'])
 ]
 
-ANSIBLE_USER_AGENT = 'Ansible-Deploy'
+ANSIBLE_USER_AGENT = 'Ansible/{0}'.format(ANSIBLE_VERSION)
+CLOUDSHELL_USER_AGENT_KEY = 'AZURE_HTTP_USER_AGENT'
 
 CIDR_PATTERN = re.compile("(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1"
                           "[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))")
@@ -132,20 +137,44 @@
     return result
 
 
-AZURE_EXPECTED_VERSIONS = dict(
-    storage_client_version="1.0.0",
-    compute_client_version="1.0.0",
-    network_client_version="1.0.0",
-    resource_client_version="1.1.0",
-    dns_client_version="1.0.1",
-    web_client_version="0.32.0"
-)
+AZURE_PKG_VERSIONS = {
+    StorageManagementClient.__name__: {
+        'package_name': 'storage',
+        'expected_version': '1.0.0',
+        'installed_version': storage_client_version
+    },
+    ComputeManagementClient.__name__: {
+        'package_name': 'compute',
+        'expected_version': '1.0.0',
+        'installed_version': compute_client_version
+    },
+    NetworkManagementClient.__name__: {
+        'package_name': 'network',
+        'expected_version': '1.0.0',
+        'installed_version': network_client_version
+    },
+    ResourceManagementClient.__name__: {
+        'package_name': 'resource',
+        'expected_version': '1.1.0',
+        'installed_version': resource_client_version
+    },
+    DnsManagementClient.__name__: {
+        'package_name': 'dns',
+        'expected_version': '1.0.1',
+        'installed_version': dns_client_version
+    },
+    WebSiteManagementClient.__name__: {
+        'package_name': 'web',
+        'expected_version': '0.32.0',
+        'installed_version': web_client_version
+    },
+} if HAS_AZURE else {}
+
 
 AZURE_MIN_RELEASE = '2.0.0'
 
 
 class AzureRMModuleBase(object):
-
     def __init__(self, derived_arg_spec, bypass_checks=False, no_log=False,
                  check_invalid_arguments=True, mutually_exclusive=None, required_together=None,
                  required_one_of=None, add_file_common_args=False, supports_check_mode=False,
@@ -256,12 +285,17 @@
             res = self.exec_module(**self.module.params)
             self.module.exit_json(**res)
 
-    def check_client_version(self, client_name, client_version, expected_version):
+    def check_client_version(self, client_type):
         # Ensure Azure modules are at least 2.0.0rc5.
-        if Version(client_version) < Version(expected_version):
-            self.fail("Installed {0} client version is {1}. The supported version is {2}. Try "
-                      "`pip install azure>={3} --upgrade`".format(client_name, client_version, expected_version,
-                                                                  AZURE_MIN_RELEASE))
+        package_version = AZURE_PKG_VERSIONS.get(client_type.__name__, None)
+        if package_version is not None:
+            client_name = package_version.get('package_name')
+            client_version = package_version.get('installed_version')
+            expected_version = package_version.get('expected_version')
+            if Version(client_version) < Version(expected_version):
+                self.fail("Installed {0} client version is {1}. The supported version is {2}. Try "
+                          "`pip install azure>={3} --upgrade`".format(client_name, client_version, expected_version,
+                                                                      AZURE_MIN_RELEASE))
 
     def exec_module(self, **kwargs):
         self.fail("Error: {0} failed to implement exec_module method.".format(self.__class__.__name__))
@@ -474,7 +508,7 @@
             self.log("dependencies: ")
             self.log(str(dependencies))
         serializer = Serializer(classes=dependencies)
-        return serializer.body(obj, class_name)
+        return serializer.body(obj, class_name, keep_readonly=True)
 
     def get_poller_result(self, poller, wait=5):
         '''
@@ -652,107 +686,81 @@
 
         return self.get_poller_result(poller)
 
-    def _register(self, key):
-        try:
-            # We have to perform the one-time registration here. Otherwise, we receive an error the first
-            # time we attempt to use the requested client.
-            resource_client = self.rm_client
-            resource_client.providers.register(key)
-        except Exception as exc:
-            self.log("One-time registration of {0} failed - {1}".format(key, str(exc)))
-            self.log("You might need to register {0} using an admin account".format(key))
-            self.log(("To register a provider using the Python CLI: "
-                      "https://docs.microsoft.com/azure/azure-resource-manager/"
-                      "resource-manager-common-deployment-errors#noregisteredproviderfound"))
+    def get_mgmt_svc_client(self, client_type, base_url=None, api_version=None):
+        self.log('Getting management service client {0}'.format(client_type.__name__))
+        self.check_client_version(client_type)
+        if api_version:
+            client = client_type(self.azure_credentials,
+                                 self.subscription_id,
+                                 api_version=api_version,
+                                 base_url=base_url)
+        else:
+            client = client_type(self.azure_credentials,
+                                 self.subscription_id,
+                                 base_url=base_url)
+
+        # Add user agent for Ansible
+        client.config.add_user_agent(ANSIBLE_USER_AGENT)
+        # Add user agent when running from Cloud Shell
+        if CLOUDSHELL_USER_AGENT_KEY in os.environ:
+            client.config.add_user_agent(os.environ[CLOUDSHELL_USER_AGENT_KEY])
+
+        return client
 
     @property
     def storage_client(self):
         self.log('Getting storage client...')
         if not self._storage_client:
-            self.check_client_version('storage', storage_client_version, AZURE_EXPECTED_VERSIONS['storage_client_version'])
-            self._storage_client = StorageManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-06-01'
-            )
-            self._register('Microsoft.Storage')
+            self._storage_client = self.get_mgmt_svc_client(StorageManagementClient,
+                                                            base_url=self._cloud_environment.endpoints.resource_manager,
+                                                            api_version='2017-06-01')
         return self._storage_client
 
     @property
     def network_client(self):
         self.log('Getting network client')
         if not self._network_client:
-            self.check_client_version('network', network_client_version, AZURE_EXPECTED_VERSIONS['network_client_version'])
-            self._network_client = NetworkManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-06-01'
-            )
-            self._register('Microsoft.Network')
+            self._network_client = self.get_mgmt_svc_client(NetworkManagementClient,
+                                                            base_url=self._cloud_environment.endpoints.resource_manager,
+                                                            api_version='2017-06-01')
         return self._network_client
 
     @property
     def rm_client(self):
         self.log('Getting resource manager client')
         if not self._resource_client:
-            self.check_client_version('resource', resource_client_version, AZURE_EXPECTED_VERSIONS['resource_client_version'])
-            self._resource_client = ResourceManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-05-10'
-            )
+            self._resource_client = self.get_mgmt_svc_client(ResourceManagementClient,
+                                                             base_url=self._cloud_environment.endpoints.resource_manager,
+                                                             api_version='2017-05-10')
         return self._resource_client
 
     @property
     def compute_client(self):
         self.log('Getting compute client')
         if not self._compute_client:
-            self.check_client_version('compute', compute_client_version, AZURE_EXPECTED_VERSIONS['compute_client_version'])
-            self._compute_client = ComputeManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-03-30'
-            )
-            self._register('Microsoft.Compute')
+            self._compute_client = self.get_mgmt_svc_client(ComputeManagementClient,
+                                                            base_url=self._cloud_environment.endpoints.resource_manager,
+                                                            api_version='2017-03-30')
         return self._compute_client
 
     @property
     def dns_client(self):
         self.log('Getting dns client')
         if not self._dns_client:
-            self.check_client_version('dns', dns_client_version, AZURE_EXPECTED_VERSIONS['dns_client_version'])
-            self._dns_client = DnsManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-            )
-            self._register('Microsoft.Dns')
+            self._dns_client = self.get_mgmt_svc_client(DnsManagementClient,
+                                                        base_url=self._cloud_environment.endpoints.resource_manager)
         return self._dns_client
 
     @property
     def web_client(self):
         self.log('Getting web client')
         if not self._web_client:
-            self.check_client_version('web', web_client_version, AZURE_EXPECTED_VERSIONS['web_client_version'])
-            self._web_client = WebSiteManagementClient(
-                credentials=self.azure_credentials,
-                subscription_id=self.subscription_id,
-                base_url=self.base_url
-            )
-            self._register('Microsoft.Web')
+            self._web_client = self.get_mgmt_svc_client(WebSiteManagementClient, base_url=self.base_url)
         return self._web_client
 
     @property
     def containerservice_client(self):
         self.log('Getting container service client')
         if not self._containerservice_client:
-            self._containerservice_client = ContainerServiceClient(
-                self.azure_credentials,
-                self.subscription_id
-            )
-            self._register('Microsoft.ContainerService')
+            self._containerservice_client = self.get_mgmt_svc_client(ContainerServiceClient)
         return self._containerservice_client
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/basic.py ansible-2.4.2.0/lib/ansible/module_utils/basic.py
--- ansible-2.4.1.0/lib/ansible/module_utils/basic.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/basic.py	2017-11-29 21:10:31.000000000 +0000
@@ -87,7 +87,7 @@
 import datetime
 from collections import deque
 from collections import Mapping, MutableMapping, Sequence, MutableSequence, Set, MutableSet
-from itertools import repeat, chain
+from itertools import chain, repeat
 
 try:
     import syslog
@@ -137,6 +137,11 @@
     except SyntaxError:
         print('\n{"msg": "SyntaxError: probably due to installed simplejson being for a different python version", "failed": true}')
         sys.exit(1)
+    else:
+        sj_version = json.__version__.split('.')
+        if sj_version < ['1', '6']:
+            # Version 1.5 released 2007-01-18 does not have the encoding parameter which we need
+            print('\n{"msg": "Error: Ansible requires the stdlib json or simplejson >= 1.6.  Neither was found!", "failed": true}')
 
 AVAILABLE_HASH_ALGORITHMS = dict()
 try:
@@ -763,15 +768,32 @@
     return ''.join(flags)
 
 
-class AnsibleFallbackNotFound(Exception):
-    pass
+def _json_encode_fallback(obj):
+    if isinstance(obj, Set):
+        return list(obj)
+    elif isinstance(obj, datetime.datetime):
+        return obj.isoformat()
+    raise TypeError("Cannot json serialize %s" % to_native(obj))
+
+
+def jsonify(data, **kwargs):
+    for encoding in ("utf-8", "latin-1"):
+        try:
+            return json.dumps(data, encoding=encoding, default=_json_encode_fallback, **kwargs)
+        # Old systems using old simplejson module does not support encoding keyword.
+        except TypeError:
+            try:
+                new_data = json_dict_bytes_to_unicode(data, encoding=encoding)
+            except UnicodeDecodeError:
+                continue
+            return json.dumps(new_data, default=_json_encode_fallback, **kwargs)
+        except UnicodeDecodeError:
+            continue
+    raise UnicodeError('Invalid unicode encoding encountered')
 
 
-class _SetEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, Set):
-            return list(obj)
-        return super(_SetEncoder, self).default(obj)
+class AnsibleFallbackNotFound(Exception):
+    pass
 
 
 class AnsibleModule(object):
@@ -801,6 +823,7 @@
         self._debug = False
         self._diff = False
         self._socket_path = None
+        self._shell = None
         self._verbosity = 0
         # May be used to set modifications to the environment for any
         # run_command invocation
@@ -811,7 +834,7 @@
         self.aliases = {}
         self._legal_inputs = ['_ansible_check_mode', '_ansible_no_log', '_ansible_debug', '_ansible_diff', '_ansible_verbosity',
                               '_ansible_selinux_special_fs', '_ansible_module_name', '_ansible_version', '_ansible_syslog_facility',
-                              '_ansible_socket']
+                              '_ansible_socket', '_ansible_shell_executable']
         self._options_context = list()
 
         if add_file_common_args:
@@ -1613,6 +1636,9 @@
             elif k == '_ansible_socket':
                 self._socket_path = v
 
+            elif k == '_ansible_shell_executable' and v:
+                self._shell = v
+
             elif check_invalid_arguments and k not in legal_inputs:
                 unsupported_parameters.add(k)
 
@@ -2197,19 +2223,10 @@
             self.fail_json(msg=to_native(e))
 
     def jsonify(self, data):
-        for encoding in ("utf-8", "latin-1"):
-            try:
-                return json.dumps(data, encoding=encoding, cls=_SetEncoder)
-            # Old systems using old simplejson module does not support encoding keyword.
-            except TypeError:
-                try:
-                    new_data = json_dict_bytes_to_unicode(data, encoding=encoding)
-                except UnicodeDecodeError:
-                    continue
-                return json.dumps(new_data, cls=_SetEncoder)
-            except UnicodeDecodeError:
-                continue
-        self.fail_json(msg='Invalid unicode encoding encountered')
+        try:
+            return jsonify(data)
+        except UnicodeError as e:
+            self.fail_json(msg=to_text(e))
 
     def from_json(self, data):
         return json.loads(data)
@@ -2602,24 +2619,37 @@
             strings on python3, use encoding=None to turn decoding to text off.
         '''
 
+        if not isinstance(args, (list, binary_type, text_type)):
+            msg = "Argument 'args' to run_command must be list or string"
+            self.fail_json(rc=257, cmd=args, msg=msg)
+
         shell = False
-        if isinstance(args, list):
-            if use_unsafe_shell:
+        if use_unsafe_shell:
+
+            # stringify args for unsafe/direct shell usage
+            if isinstance(args, list):
                 args = " ".join([shlex_quote(x) for x in args])
+
+            # not set explicitly, check if set by controller
+            if executable:
+                args = [executable, '-c', args]
+            elif self._shell not in (None, '/bin/sh'):
+                args = [self._shell, '-c', args]
+            else:
                 shell = True
-        elif isinstance(args, (binary_type, text_type)) and use_unsafe_shell:
-            shell = True
-        elif isinstance(args, (binary_type, text_type)):
-            # On python2.6 and below, shlex has problems with text type
-            # On python3, shlex needs a text type.
-            if PY2:
-                args = to_bytes(args, errors='surrogate_or_strict')
-            elif PY3:
-                args = to_text(args, errors='surrogateescape')
-            args = shlex.split(args)
         else:
-            msg = "Argument 'args' to run_command must be list or string"
-            self.fail_json(rc=257, cmd=args, msg=msg)
+            # ensure args are a list
+            if isinstance(args, (binary_type, text_type)):
+                # On python2.6 and below, shlex has problems with text type
+                # On python3, shlex needs a text type.
+                if PY2:
+                    args = to_bytes(args, errors='surrogate_or_strict')
+                elif PY3:
+                    args = to_text(args, errors='surrogateescape')
+                args = shlex.split(args)
+
+            # expand shellisms
+            args = [os.path.expanduser(os.path.expandvars(x)) for x in args if x is not None]
 
         prompt_re = None
         if prompt_regex:
@@ -2633,10 +2663,6 @@
             except re.error:
                 self.fail_json(msg="invalid prompt regular expression given to run_command")
 
-        # expand things like $HOME and ~
-        if not shell:
-            args = [os.path.expanduser(os.path.expandvars(x)) for x in args if x is not None]
-
         rc = 0
         msg = None
         st_in = None
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/eos.py ansible-2.4.2.0/lib/ansible/module_utils/eos.py
--- ansible-2.4.1.0/lib/ansible/module_utils/eos.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/eos.py	2017-11-29 21:10:31.000000000 +0000
@@ -299,7 +299,7 @@
         commands = to_list(commands)
 
         if self._enable:
-            commands.insert(0, 'enable')
+            commands.insert(0, self._enable)
 
         body = self._request_builder(commands, output)
         data = self._module.jsonify(body)
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/facts/system/distribution.py ansible-2.4.2.0/lib/ansible/module_utils/facts/system/distribution.py
--- ansible-2.4.1.0/lib/ansible/module_utils/facts/system/distribution.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/facts/system/distribution.py	2017-11-29 21:10:31.000000000 +0000
@@ -491,7 +491,9 @@
         darwin_facts['distribution'] = 'MacOSX'
         rc, out, err = self.module.run_command("/usr/bin/sw_vers -productVersion")
         data = out.split()[-1]
-        darwin_facts['distribution_version'] = data
+        if data:
+            darwin_facts['distribution_major_version'] = data.split('.')[0]
+            darwin_facts['distribution_version'] = data
         return darwin_facts
 
     def get_distribution_FreeBSD(self):
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/facts/system/service_mgr.py ansible-2.4.2.0/lib/ansible/module_utils/facts/system/service_mgr.py
--- ansible-2.4.1.0/lib/ansible/module_utils/facts/system/service_mgr.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/facts/system/service_mgr.py	2017-11-29 21:10:31.000000000 +0000
@@ -105,22 +105,22 @@
 
         # FIXME: replace with a system->service_mgr_name map?
         # start with the easy ones
-        elif collected_facts.get('distribution', None) == 'MacOSX':
+        elif collected_facts.get('ansible_distribution', None) == 'MacOSX':
             # FIXME: find way to query executable, version matching is not ideal
             if LooseVersion(platform.mac_ver()[0]) >= LooseVersion('10.4'):
                 service_mgr_name = 'launchd'
             else:
                 service_mgr_name = 'systemstarter'
-        elif 'BSD' in collected_facts.get('system', '') or collected_facts.get('system') in ['Bitrig', 'DragonFly']:
+        elif 'BSD' in collected_facts.get('ansible_system', '') or collected_facts.get('ansible_system') in ['Bitrig', 'DragonFly']:
             # FIXME: we might want to break out to individual BSDs or 'rc'
             service_mgr_name = 'bsdinit'
-        elif collected_facts.get('system') == 'AIX':
+        elif collected_facts.get('ansible_system') == 'AIX':
             service_mgr_name = 'src'
-        elif collected_facts.get('system') == 'SunOS':
+        elif collected_facts.get('ansible_system') == 'SunOS':
             service_mgr_name = 'smf'
-        elif collected_facts.get('distribution') == 'OpenWrt':
+        elif collected_facts.get('ansible_distribution') == 'OpenWrt':
             service_mgr_name = 'openwrt_init'
-        elif collected_facts.get('system') == 'Linux':
+        elif collected_facts.get('ansible_system') == 'Linux':
             # FIXME: mv is_systemd_managed
             if self.is_systemd_managed(module=module):
                 service_mgr_name = 'systemd'
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/json_utils.py ansible-2.4.2.0/lib/ansible/module_utils/json_utils.py
--- ansible-2.4.1.0/lib/ansible/module_utils/json_utils.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/json_utils.py	2017-11-29 21:10:31.000000000 +0000
@@ -23,7 +23,6 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-
 try:
     import json
 except ImportError:
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/k8s_common.py ansible-2.4.2.0/lib/ansible/module_utils/k8s_common.py
--- ansible-2.4.1.0/lib/ansible/module_utils/k8s_common.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/k8s_common.py	2017-11-29 21:10:31.000000000 +0000
@@ -122,10 +122,6 @@
         :return: None
         """
 
-        if self.params.get('debug'):
-            self.helper.enable_debug(reset_logfile=False)
-            self.helper.log_argspec()
-
         resource_definition = self.params.get('resource_definition')
         if self.params.get('src'):
             resource_definition = self.load_resource_definition(self.params['src'])
@@ -225,10 +221,10 @@
                 return_attributes[self.kind] = existing.to_dict()
                 self.exit_json(**return_attributes)
             else:
-                self.helper.log('Existing:')
-                self.helper.log(json.dumps(existing.to_dict(), indent=4))
-                self.helper.log('\nDifferences:')
-                self.helper.log(json.dumps(diff, indent=4))
+                self.log('Existing:')
+                self.log(json.dumps(existing.to_str(), indent=4))
+                self.log('\nDifferences:')
+                self.log(json.dumps(diff, indent=4))
             # Differences exist between the existing obj and requested params
             if not self.check_mode:
                 try:
@@ -267,7 +263,7 @@
         """ Load the requested src path """
         result = None
         path = os.path.normpath(src)
-        self.helper.log("Reading definition from {}".format(path))
+        self.log("Reading definition from {}".format(path))
         if not os.path.exists(path):
             self.fail_json(msg="Error accessing {}. Does the file exist?".format(path))
         try:
@@ -290,7 +286,7 @@
                     parameters[key] = value
             elif isinstance(value, dict):
                 self._add_parameter(value, [key], parameters)
-        self.helper.log("Request to parameters: {}".format(json.dumps(parameters)))
+        self.log("Request to parameters: {}".format(json.dumps(parameters)))
         return parameters
 
     def _add_parameter(self, request, path, parameters):
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/known_hosts.py ansible-2.4.2.0/lib/ansible/module_utils/known_hosts.py
--- ansible-2.4.1.0/lib/ansible/module_utils/known_hosts.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/known_hosts.py	2017-11-29 21:10:31.000000000 +0000
@@ -30,10 +30,7 @@
 import hmac
 import re
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 
 try:
     from hashlib import sha1
@@ -75,7 +72,7 @@
             fqdn = repo_url.split("/")[0]
     elif "://" in repo_url:
         # this should be something we can parse with urlparse
-        parts = urlparse.urlparse(repo_url)
+        parts = urlparse(repo_url)
         # parts[1] will be empty on python2.4 on ssh:// or git:// urls, so
         # ensure we actually have a parts[1] before continuing.
         if parts[1] != '':
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/nxos.py ansible-2.4.2.0/lib/ansible/module_utils/nxos.py
--- ansible-2.4.1.0/lib/ansible/module_utils/nxos.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/nxos.py	2017-11-29 21:10:31.000000000 +0000
@@ -151,10 +151,16 @@
             if check_rc and rc != 0:
                 self._module.fail_json(msg=to_text(err, errors='surrogate_then_replace'))
 
-            try:
-                out = self._module.from_json(out)
-            except ValueError:
-                out = str(out).strip()
+            if not check_rc and rc != 0:
+                try:
+                    out = self._module.from_json(err)
+                except ValueError:
+                    out = to_text(err, errors='surrogate_then_replace').strip()
+            else:
+                try:
+                    out = self._module.from_json(out)
+                except ValueError:
+                    out = to_text(out, errors='surrogate_then_replace').strip()
 
             responses.append(out)
         return responses
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/urls.py ansible-2.4.2.0/lib/ansible/module_utils/urls.py
--- ansible-2.4.1.0/lib/ansible/module_utils/urls.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/urls.py	2017-11-29 21:10:31.000000000 +0000
@@ -675,7 +675,7 @@
         make sure we get back a valid code from the proxy
         '''
         try:
-            (http_version, resp_code, msg) = re.match(r'(HTTP/\d\.\d) (\d\d\d) (.*)', response).groups()
+            (http_version, resp_code, msg) = re.match(br'(HTTP/\d\.\d) (\d\d\d) (.*)', response).groups()
             if int(resp_code) not in valid_codes:
                 raise Exception
         except:
@@ -698,10 +698,13 @@
         return True
 
     def _make_context(self, to_add_ca_cert_path):
-        if HAS_URLLIB3_PYOPENSSLCONTEXT:
+        if HAS_SSLCONTEXT:
+            context = create_default_context()
+        elif HAS_URLLIB3_PYOPENSSLCONTEXT:
             context = PyOpenSSLContext(PROTOCOL)
         else:
-            context = create_default_context()
+            raise NotImplementedError('Host libraries are too old to support creating an sslcontext')
+
         if to_add_ca_cert_path:
             context.load_verify_locations(to_add_ca_cert_path)
         return context
@@ -710,8 +713,11 @@
         tmp_ca_cert_path, to_add_ca_cert_path, paths_checked = self.get_ca_certs()
         https_proxy = os.environ.get('https_proxy')
         context = None
-        if HAS_SSLCONTEXT or HAS_URLLIB3_PYOPENSSLCONTEXT:
+        try:
             context = self._make_context(to_add_ca_cert_path)
+        except Exception:
+            # We'll make do with no context below
+            pass
 
         # Detect if 'no_proxy' environment variable is set and if our URL is included
         use_proxy = self.detect_no_proxy(req.get_full_url())
diff -Nru ansible-2.4.1.0/lib/ansible/module_utils/vmware.py ansible-2.4.2.0/lib/ansible/module_utils/vmware.py
--- ansible-2.4.1.0/lib/ansible/module_utils/vmware.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/module_utils/vmware.py	2017-11-29 21:10:31.000000000 +0000
@@ -31,6 +31,7 @@
 except ImportError:
     HAS_PYVMOMI = False
 
+from ansible.module_utils._text import to_text
 from ansible.module_utils.urls import fetch_url
 from ansible.module_utils.six import integer_types, iteritems, string_types
 
@@ -234,7 +235,11 @@
     thisobj = vobj
     while hasattr(thisobj, 'parent'):
         thisobj = thisobj.parent
-        if thisobj.name == 'Datacenters':
+        try:
+            moid = thisobj._moId
+        except AttributeError:
+            moid = None
+        if moid in ['group-d1', 'ha-folder-root']:
             break
         if isinstance(thisobj, vim.Folder):
             paths.append(thisobj.name)
@@ -403,6 +408,9 @@
         service_instance = connect.SmartConnect(host=hostname, user=username, pwd=password, sslContext=ssl_context)
     except vim.fault.InvalidLogin as e:
         module.fail_json(msg="Unable to log on to vCenter or ESXi API at %s as %s: %s" % (hostname, username, e.msg))
+    except vim.fault.NoPermission as e:
+        module.fail_json(msg="User %s does not have required permission"
+                             " to log on to vCenter or ESXi API at %s: %s" % (username, hostname, e.msg))
     except (requests.ConnectionError, ssl.SSLError) as e:
         module.fail_json(msg="Unable to connect to vCenter or ESXi API at %s on TCP/443: %s" % (hostname, e))
     except Exception as e:
@@ -593,22 +601,14 @@
         xt = type(xo)
         if xo is None:
             data[x] = None
-        elif issubclass(xt, list):
-            data[x] = []
-            for xe in xo:
-                data[x].append(serialize_spec(xe))
-        elif issubclass(xt, string_types + integer_types + (float, bool)):
-            data[x] = xo
-        elif issubclass(xt, dict):
-            data[x] = {}
-            for k, v in xo.items():
-                data[x][k] = serialize_spec(v)
         elif isinstance(xo, vim.vm.ConfigSpec):
             data[x] = serialize_spec(xo)
         elif isinstance(xo, vim.vm.RelocateSpec):
             data[x] = serialize_spec(xo)
         elif isinstance(xo, vim.vm.device.VirtualDisk):
             data[x] = serialize_spec(xo)
+        elif isinstance(xo, vim.vm.device.VirtualDeviceSpec.FileOperation):
+            data[x] = serialize_spec(xo)
         elif isinstance(xo, vim.Description):
             data[x] = {
                 'dynamicProperty': serialize_spec(xo.dynamicProperty),
@@ -617,9 +617,22 @@
                 'summary': serialize_spec(xo.summary),
             }
         elif hasattr(xo, 'name'):
-            data[x] = str(xo) + ':' + xo.name
+            data[x] = to_text(xo) + ':' + to_text(xo.name)
         elif isinstance(xo, vim.vm.ProfileSpec):
             pass
+        elif issubclass(xt, list):
+            data[x] = []
+            for xe in xo:
+                data[x].append(serialize_spec(xe))
+        elif issubclass(xt, string_types + integer_types + (float, bool)):
+            data[x] = to_text(xt)
+        elif issubclass(xt, bool):
+            data[x] = xo
+        elif issubclass(xt, dict):
+            data[to_text(x)] = {}
+            for k, v in xo.items():
+                k = to_text(k)
+                data[x][k] = serialize_spec(v)
         else:
             data[x] = str(xt)
 
diff -Nru ansible-2.4.1.0/lib/ansible/parsing/vault/__init__.py ansible-2.4.2.0/lib/ansible/parsing/vault/__init__.py
--- ansible-2.4.1.0/lib/ansible/parsing/vault/__init__.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/parsing/vault/__init__.py	2017-11-29 21:10:32.000000000 +0000
@@ -29,6 +29,7 @@
 import warnings
 from binascii import hexlify
 from binascii import unhexlify
+from binascii import Error as BinasciiError
 from hashlib import md5
 from hashlib import sha256
 from io import BytesIO
@@ -105,6 +106,10 @@
     pass
 
 
+class AnsibleVaultFormatError(AnsibleError):
+    pass
+
+
 def is_encrypted(data):
     """ Test if this is vault encrypted data blob
 
@@ -148,20 +153,7 @@
         file_obj.seek(current_position)
 
 
-def parse_vaulttext_envelope(b_vaulttext_envelope, default_vault_id=None):
-    """Retrieve information about the Vault and clean the data
-
-    When data is saved, it has a header prepended and is formatted into 80
-    character lines.  This method extracts the information from the header
-    and then removes the header and the inserted newlines.  The string returned
-    is suitable for processing by the Cipher classes.
-
-    :arg b_vaulttext: byte str containing the data from a save file
-    :returns: a byte str suitable for passing to a Cipher class's
-        decrypt() function.
-    """
-    # used by decrypt
-    default_vault_id = default_vault_id or C.DEFAULT_VAULT_IDENTITY
+def _parse_vaulttext_envelope(b_vaulttext_envelope, default_vault_id=None):
 
     b_tmpdata = b_vaulttext_envelope.splitlines()
     b_tmpheader = b_tmpdata[0].strip().split(b';')
@@ -169,7 +161,6 @@
     b_version = b_tmpheader[1].strip()
     cipher_name = to_text(b_tmpheader[2].strip())
     vault_id = default_vault_id
-    # vault_id = None
 
     # Only attempt to find vault_id if the vault file is version 1.2 or newer
     # if self.b_version == b'1.2':
@@ -181,6 +172,37 @@
     return b_ciphertext, b_version, cipher_name, vault_id
 
 
+def parse_vaulttext_envelope(b_vaulttext_envelope, default_vault_id=None, filename=None):
+    """Parse the vaulttext envelope
+
+    When data is saved, it has a header prepended and is formatted into 80
+    character lines.  This method extracts the information from the header
+    and then removes the header and the inserted newlines.  The string returned
+    is suitable for processing by the Cipher classes.
+
+    :arg b_vaulttext: byte str containing the data from a save file
+    :kwarg default_vault_id: The vault_id name to use if the vaulttext does not provide one.
+    :kwarg filename: The filename that the data came from.  This is only
+        used to make better error messages in case the data cannot be
+        decrypted. This is optional.
+    :returns: A tuple of byte str of the vaulttext suitable to pass to parse_vaultext,
+        a byte str of the vault format version,
+        the name of the cipher used, and the vault_id.
+    :raises: AnsibleVaultFormatError: if the vaulttext_envelope format is invalid
+    """
+    # used by decrypt
+    default_vault_id = default_vault_id or C.DEFAULT_VAULT_IDENTITY
+
+    try:
+        return _parse_vaulttext_envelope(b_vaulttext_envelope, default_vault_id)
+    except Exception as exc:
+        msg = "Vault envelope format error"
+        if filename:
+            msg += ' in %s' % (filename)
+        msg += ': %s' % exc
+        raise AnsibleVaultFormatError(msg)
+
+
 def format_vaulttext_envelope(b_ciphertext, cipher_name, version=None, vault_id=None):
     """ Add header and format to 80 columns
 
@@ -222,6 +244,41 @@
     return b_vaulttext
 
 
+def _unhexlify(b_data):
+    try:
+        return unhexlify(b_data)
+    except (BinasciiError, TypeError) as exc:
+        raise AnsibleVaultFormatError('Vault format unhexlify error: %s' % exc)
+
+
+def _parse_vaulttext(b_vaulttext):
+    b_vaulttext = _unhexlify(b_vaulttext)
+    b_salt, b_crypted_hmac, b_ciphertext = b_vaulttext.split(b"\n", 2)
+    b_salt = _unhexlify(b_salt)
+    b_ciphertext = _unhexlify(b_ciphertext)
+
+    return b_ciphertext, b_salt, b_crypted_hmac
+
+
+def parse_vaulttext(b_vaulttext):
+    """Parse the vaulttext
+
+    :arg b_vaulttext: byte str containing the vaulttext (ciphertext, salt, crypted_hmac)
+    :returns: A tuple of byte str of the ciphertext suitable for passing to a
+        Cipher class's decrypt() function, a byte str of the salt,
+        and a byte str of the crypted_hmac
+    :raises: AnsibleVaultFormatError: if the vaulttext format is invalid
+    """
+    # SPLIT SALT, DIGEST, AND DATA
+    try:
+        return _parse_vaulttext(b_vaulttext)
+    except AnsibleVaultFormatError:
+        raise
+    except Exception as exc:
+        msg = "Vault vaulttext format error: %s" % exc
+        raise AnsibleVaultFormatError(msg)
+
+
 def verify_secret_is_not_empty(secret, msg=None):
     '''Check the secret against minimal requirements.
 
@@ -526,7 +583,8 @@
                 msg += "%s is not a vault encrypted file" % filename
             raise AnsibleError(msg)
 
-        b_vaulttext, dummy, cipher_name, vault_id = parse_vaulttext_envelope(b_vaulttext)
+        b_vaulttext, dummy, cipher_name, vault_id = parse_vaulttext_envelope(b_vaulttext,
+                                                                             filename=filename)
 
         # create the cipher object, note that the cipher used for decrypt can
         # be different than the cipher used for encrypt
@@ -582,6 +640,13 @@
                     vault_id_used = vault_secret_id
                     display.vvvvv('decrypt succesful with secret=%s and vault_id=%s' % (vault_secret, vault_secret_id))
                     break
+            except AnsibleVaultFormatError as exc:
+                msg = "There was a vault format error"
+                if filename:
+                    msg += ' in %s' % (filename)
+                msg += ': %s' % exc
+                display.warning(msg)
+                raise
             except AnsibleError as e:
                 display.vvvv('Tried to use the vault secret (%s) to decrypt (%s) but it failed. Error: %s' %
                              (vault_secret_id, filename, e))
@@ -779,7 +844,8 @@
 
         # Figure out the vault id from the file, to select the right secret to re-encrypt it
         # (duplicates parts of decrypt, but alas...)
-        dummy, dummy, cipher_name, vault_id = parse_vaulttext_envelope(b_vaulttext)
+        dummy, dummy, cipher_name, vault_id = parse_vaulttext_envelope(b_vaulttext,
+                                                                       filename=filename)
 
         # vault id here may not be the vault id actually used for decrypting
         # as when the edited file has no vault-id but is decrypted by non-default id in secrets
@@ -1053,7 +1119,7 @@
                            'switch to the newer VaultAES256 format', version='2.3')
         # http://stackoverflow.com/a/14989032
 
-        b_vaultdata = unhexlify(b_vaulttext)
+        b_vaultdata = _unhexlify(b_vaulttext)
         b_salt = b_vaultdata[len(b'Salted__'):16]
         b_ciphertext = b_vaultdata[16:]
 
@@ -1206,7 +1272,7 @@
         hmac = HMAC(b_key2, hashes.SHA256(), CRYPTOGRAPHY_BACKEND)
         hmac.update(b_ciphertext)
         try:
-            hmac.verify(unhexlify(b_crypted_hmac))
+            hmac.verify(_unhexlify(b_crypted_hmac))
         except InvalidSignature as e:
             raise AnsibleVaultError('HMAC verification failed: %s' % e)
 
@@ -1268,11 +1334,8 @@
 
     @classmethod
     def decrypt(cls, b_vaulttext, secret):
-        # SPLIT SALT, DIGEST, AND DATA
-        b_vaulttext = unhexlify(b_vaulttext)
-        b_salt, b_crypted_hmac, b_ciphertext = b_vaulttext.split(b"\n", 2)
-        b_salt = unhexlify(b_salt)
-        b_ciphertext = unhexlify(b_ciphertext)
+
+        b_ciphertext, b_salt, b_crypted_hmac = parse_vaulttext(b_vaulttext)
 
         # TODO: would be nice if a VaultSecret could be passed directly to _decrypt_*
         #       (move _gen_key_initctr() to a AES256 VaultSecret or VaultContext impl?)
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/action/ce_template.py ansible-2.4.2.0/lib/ansible/plugins/action/ce_template.py
--- ansible-2.4.1.0/lib/ansible/plugins/action/ce_template.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/action/ce_template.py	2017-11-29 21:10:32.000000000 +0000
@@ -22,7 +22,7 @@
 import os
 import time
 import glob
-import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlsplit
 
 from ansible.module_utils._text import to_text
 from ansible.plugins.action.ce import ActionModule as _ActionModule
@@ -72,7 +72,7 @@
 
         working_path = self._get_working_path()
 
-        if os.path.isabs(src) or urlparse.urlsplit(src).scheme:
+        if os.path.isabs(src) or urlsplit(src).scheme:
             source = src
         else:
             source = self._loader.path_dwim_relative(working_path, 'templates', src)
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/action/__init__.py ansible-2.4.2.0/lib/ansible/plugins/action/__init__.py
--- ansible-2.4.1.0/lib/ansible/plugins/action/__init__.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/action/__init__.py	2017-11-29 21:10:32.000000000 +0000
@@ -607,6 +607,9 @@
         # give the module the socket for persistent connections
         module_args['_ansible_socket'] = task_vars.get('ansible_socket')
 
+        # make sure all commands use the designated shell executable
+        module_args['_ansible_shell_executable'] = self._play_context.executable
+
     def _execute_module(self, module_name=None, module_args=None, tmp=None, task_vars=None, persist_files=False, delete_remote_tmp=True, wrap_async=False):
         '''
         Transfer and run a module along with its arguments.
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/action/ios.py ansible-2.4.2.0/lib/ansible/plugins/action/ios.py
--- ansible-2.4.1.0/lib/ansible/plugins/action/ios.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/action/ios.py	2017-11-29 21:10:32.000000000 +0000
@@ -73,9 +73,10 @@
         # make sure we are in the right cli context which should be
         # enable mode and not config module
         rc, out, err = connection.exec_command('prompt()')
-        if str(out).strip().endswith(')#'):
+        while str(out).strip().endswith(')#'):
             display.vvvv('wrong context, sending exit to device', self._play_context.remote_addr)
             connection.exec_command('exit')
+            rc, out, err = connection.exec_command('prompt()')
 
         task_vars['ansible_socket'] = socket_path
 
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/action/pause.py ansible-2.4.2.0/lib/ansible/plugins/action/pause.py
--- ansible-2.4.1.0/lib/ansible/plugins/action/pause.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/action/pause.py	2017-11-29 21:10:32.000000000 +0000
@@ -124,22 +124,36 @@
 
             # save the attributes on the existing (duped) stdin so
             # that we can restore them later after we set raw mode
-            if PY3:
-                stdin = self._connection._new_stdin.buffer
-            else:
-                stdin = self._connection._new_stdin
             fd = None
             try:
+                if PY3:
+                    stdin = self._connection._new_stdin.buffer
+                else:
+                    stdin = self._connection._new_stdin
                 fd = stdin.fileno()
             except (ValueError, AttributeError):
                 # ValueError: someone is using a closed file descriptor as stdin
                 # AttributeError: someone is using a null file descriptor as stdin on windoez
-                pass
+                stdin = None
             if fd is not None:
                 if isatty(fd):
                     old_settings = termios.tcgetattr(fd)
                     tty.setraw(fd)
 
+                    # Enable a few things turned off by tty.setraw()
+                    # ICANON -> Allows characters to be deleted and hides things like ^M.
+                    # ICRNL -> Makes the return key work when ICANON is enabled, otherwise
+                    #          you get stuck at the prompt with no way to get out of it.
+                    # ECHO -> Echos input back to stdout
+                    #
+                    # See man termios for details on these flags
+                    if not seconds:
+                        new_settings = termios.tcgetattr(fd)
+                        new_settings[0] = new_settings[0] | termios.ICRNL
+                        new_settings[3] = new_settings[3] | (termios.ICANON | termios.ECHO)
+                        termios.tcsetattr(fd, termios.TCSANOW, new_settings)
+                        termios.tcsetattr(fd, termios.TCSANOW, new_settings)
+
                     # flush the buffer to make sure no previous key presses
                     # are read in below
                     termios.tcflush(stdin, termios.TCIFLUSH)
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/action/script.py ansible-2.4.2.0/lib/ansible/plugins/action/script.py
--- ansible-2.4.1.0/lib/ansible/plugins/action/script.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/action/script.py	2017-11-29 21:10:32.000000000 +0000
@@ -19,9 +19,10 @@
 
 import os
 import re
+import shlex
 
 from ansible.errors import AnsibleError
-from ansible.module_utils._text import to_native
+from ansible.module_utils._text import to_native, to_text
 from ansible.plugins.action import ActionBase
 
 
@@ -72,30 +73,46 @@
             if self._connection._shell.SHELL_FAMILY != 'powershell' and not chdir.startswith('/'):
                 return dict(failed=True, msg='chdir %s must be an absolute path for a Unix-aware remote node' % chdir)
 
-        # the script name is the first item in the raw params, so we split it
-        # out now so we know the file name we need to transfer to the remote,
-        # and everything else is an argument to the script which we need later
-        # to append to the remote command
-        parts = self._task.args.get('_raw_params', '').strip().split()
+        # Split out the script as the first item in raw_params using
+        # shlex.split() in order to support paths and files with spaces in the name.
+        # Any arguments passed to the script will be added back later.
+        raw_params = to_native(self._task.args.get('_raw_params', ''), errors='surrogate_or_strict')
+        parts = [to_text(s, errors='surrogate_or_strict') for s in shlex.split(raw_params.strip())]
         source = parts[0]
-        args = ' '.join(parts[1:])
 
         try:
             source = self._loader.get_real_file(self._find_needle('files', source), decrypt=self._task.args.get('decrypt', True))
         except AnsibleError as e:
             return dict(failed=True, msg=to_native(e))
 
-        # transfer the file to a remote tmp location
-        tmp_src = self._connection._shell.join_path(tmp, os.path.basename(source))
-        self._transfer_file(source, tmp_src)
-
-        # set file permissions, more permissive when the copy is done as a different user
-        self._fixup_perms2((tmp, tmp_src), execute=True)
-
-        # add preparation steps to one ssh roundtrip executing the script
-        env_dict = dict()
-        env_string = self._compute_environment_string(env_dict)
-        script_cmd = ' '.join([env_string, tmp_src, args])
+        if not self._play_context.check_mode:
+            # transfer the file to a remote tmp location
+            tmp_src = self._connection._shell.join_path(tmp, os.path.basename(source))
+
+            # Convert raw_params to text for the purpose of replacing the script since
+            # parts and tmp_src are both unicode strings and raw_params will be different
+            # depending on Python version.
+            #
+            # Once everything is encoded consistently, replace the script path on the remote
+            # system with the remainder of the raw_params. This preserves quoting in parameters
+            # that would have been removed by shlex.split().
+            target_command = to_text(raw_params).strip().replace(parts[0], tmp_src)
+
+            self._transfer_file(source, tmp_src)
+
+            # set file permissions, more permissive when the copy is done as a different user
+            self._fixup_perms2((tmp, tmp_src), execute=True)
+
+            # add preparation steps to one ssh roundtrip executing the script
+            env_dict = dict()
+            env_string = self._compute_environment_string(env_dict)
+            script_cmd = ' '.join([env_string, target_command])
+
+        if self._play_context.check_mode:
+            result['changed'] = True
+            self._remove_tmp_path(tmp)
+            return result
+
         script_cmd = self._connection._shell.wrap_for_exec(script_cmd)
 
         exec_data = None
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/action/win_copy.py ansible-2.4.2.0/lib/ansible/plugins/action/win_copy.py
--- ansible-2.4.1.0/lib/ansible/plugins/action/win_copy.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/action/win_copy.py	2017-11-29 21:10:32.000000000 +0000
@@ -232,7 +232,7 @@
     def _create_zip_tempfile(self, files, directories):
         tmpdir = tempfile.mkdtemp()
         zip_file_path = os.path.join(tmpdir, "win_copy.zip")
-        zip_file = zipfile.ZipFile(zip_file_path, "w")
+        zip_file = zipfile.ZipFile(zip_file_path, "w", zipfile.ZIP_STORED, True)
 
         # encoding the file/dir name with base64 so Windows can unzip a unicode
         # filename and get the right name, Windows doesn't handle unicode names
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/callback/default.py ansible-2.4.2.0/lib/ansible/plugins/callback/default.py
--- ansible-2.4.1.0/lib/ansible/plugins/callback/default.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/callback/default.py	2017-11-29 21:10:32.000000000 +0000
@@ -95,6 +95,8 @@
         else:
 
             if (self._display.verbosity > 0 or '_ansible_verbose_always' in result._result) and '_ansible_verbose_override' not in result._result:
+                if result._task.action == 'debug' and 'changed' in result._result:
+                    del result._result['changed']
                 msg += " => %s" % (self._dump_results(result._result),)
             self._display.display(msg, color=color)
 
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/callback/__init__.py ansible-2.4.2.0/lib/ansible/plugins/callback/__init__.py
--- ansible-2.4.1.0/lib/ansible/plugins/callback/__init__.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/callback/__init__.py	2017-11-29 21:10:32.000000000 +0000
@@ -85,8 +85,6 @@
         self._plugin_options = options
 
     def _dump_results(self, result, indent=None, sort_keys=True, keep_invocation=False):
-        if result.get('_ansible_no_log', False):
-            return json.dumps(dict(censored="the output has been hidden due to the fact that 'no_log: true' was specified for this result"))
 
         if not indent and (result.get('_ansible_verbose_always') or self._display.verbosity > 2):
             indent = 4
@@ -219,8 +217,9 @@
         del result._result['results']
 
     def _clean_results(self, result, task_name):
+        ''' removes data from results for display '''
         if task_name in ['debug']:
-            for remove_key in ('changed', 'invocation', 'failed', 'skipped'):
+            for remove_key in ('invocation'):
                 if remove_key in result:
                     del result[remove_key]
 
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/connection/network_cli.py ansible-2.4.2.0/lib/ansible/plugins/connection/network_cli.py
--- ansible-2.4.1.0/lib/ansible/plugins/connection/network_cli.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/connection/network_cli.py	2017-11-29 21:10:32.000000000 +0000
@@ -248,6 +248,7 @@
                     match = regex.search(response)
                     if match:
                         errored_response = response
+                        self._matched_prompt = match.group()
                         break
 
         if not is_error_message:
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/filter/network.py ansible-2.4.2.0/lib/ansible/plugins/filter/network.py
--- ansible-2.4.1.0/lib/ansible/plugins/filter/network.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/filter/network.py	2017-11-29 21:10:32.000000000 +0000
@@ -106,8 +106,6 @@
                 match_end = end_block.match(line)
 
                 if match_start:
-                    if lines:
-                        blocks.append('\n'.join(lines))
                     lines = list()
                     lines.append(line)
                     block_started = True
@@ -115,6 +113,7 @@
                 elif match_end:
                     if lines:
                         lines.append(line)
+                        blocks.append('\n'.join(lines))
                     block_started = False
 
                 elif block_started:
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/inventory/ini.py ansible-2.4.2.0/lib/ansible/plugins/inventory/ini.py
--- ansible-2.4.1.0/lib/ansible/plugins/inventory/ini.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/inventory/ini.py	2017-11-29 21:10:32.000000000 +0000
@@ -20,6 +20,9 @@
     notes:
         - It takes the place of the previously hardcoded INI inventory.
         - To function it requires being whitelisted in configuration.
+        - Variable values are processed by Python's ast.literal_eval function (U(https://docs.python.org/2/library/ast.html#ast.literal_eval))
+          which could cause the value to change in some cases. See the Examples for proper quoting to prevent changes. Another option would be
+          to use the yaml format for inventory source which processes the values correctly.
 '''
 
 EXAMPLES = '''
@@ -40,6 +43,7 @@
       [apache]
       tomcat1
       tomcat2 myvar=34 # host specific vars override group vars
+      tomcat3 mysecret="'03#pa33w0rd'" # proper quoting to prevent value changes
 
       [nginx]
       jenkins1
@@ -149,7 +153,6 @@
         pending_declarations = {}
         groupname = 'ungrouped'
         state = 'hosts'
-
         self.lineno = 0
         for line in lines:
             self.lineno += 1
@@ -172,26 +175,21 @@
                     self._raise_error("Section [%s] has unknown type: %s" % (title, state))
 
                 # If we haven't seen this group before, we add a new Group.
-                #
-                # Either [groupname] or [groupname:children] is sufficient to
-                # declare a group, but [groupname:vars] is allowed only if the
-                # group is declared elsewhere (not necessarily earlier). We add
-                # the group anyway, but make a note in pending_declarations to
-                # check at the end.
-
-                self.inventory.add_group(groupname)
-
-                if state == 'vars':
-                    pending_declarations[groupname] = dict(line=self.lineno, state=state, name=groupname)
+                if groupname not in self.inventory.groups:
+                    # Either [groupname] or [groupname:children] is sufficient to declare a group,
+                    # but [groupname:vars] is allowed only if the # group is declared elsewhere.
+                    # We add the group anyway, but make a note in pending_declarations to check at the end.
+                    if state == 'vars':
+                        pending_declarations[groupname] = dict(line=self.lineno, state=state, name=groupname)
 
-                # When we see a declaration that we've been waiting for, we can
-                # delete the note.
+                    self.inventory.add_group(groupname)
 
+                # When we see a declaration that we've been waiting for, we process and delete.
                 if groupname in pending_declarations and state != 'vars':
                     if pending_declarations[groupname]['state'] == 'children':
-                        for parent in pending_declarations[groupname]['parents']:
-                            self.inventory.add_child(parent, groupname)
-                    del pending_declarations[groupname]
+                        self._add_pending_children(groupname, pending_declarations)
+                    elif pending_declarations[groupname]['state'] == 'vars':
+                        del pending_declarations[groupname]
 
                 continue
             elif line.startswith('[') and line.endswith(']'):
@@ -227,22 +225,25 @@
                         pending_declarations[child]['parents'].append(groupname)
                 else:
                     self.inventory.add_child(groupname, child)
-
-            # This is a fencepost. It can happen only if the state checker
-            # accepts a state that isn't handled above.
             else:
+                # This can happen only if the state checker accepts a state that isn't handled above.
                 self._raise_error("Entered unhandled state: %s" % (state))
 
         # Any entries in pending_declarations not removed by a group declaration above mean that there was an unresolved reference.
         # We report only the first such error here.
-
         for g in pending_declarations:
-            if g not in self.inventory.groups:
-                decl = pending_declarations[g]
-                if decl['state'] == 'vars':
-                    raise AnsibleError("%s:%d: Section [%s:vars] not valid for undefined group: %s" % (path, decl['line'], decl['name'], decl['name']))
-                elif decl['state'] == 'children':
-                    raise AnsibleError("%s:%d: Section [%s:children] includes undefined group: %s" % (path, decl['line'], decl['parents'].pop(), decl['name']))
+            decl = pending_declarations[g]
+            if decl['state'] == 'vars':
+                raise AnsibleError("%s:%d: Section [%s:vars] not valid for undefined group: %s" % (path, decl['line'], decl['name'], decl['name']))
+            elif decl['state'] == 'children':
+                raise AnsibleError("%s:%d: Section [%s:children] includes undefined group: %s" % (path, decl['line'], decl['parents'].pop(), decl['name']))
+
+    def _add_pending_children(self, group, pending):
+        for parent in pending[group]['parents']:
+            self.inventory.add_child(parent, group)
+            if parent in pending and pending[parent]['state'] == 'children':
+                self._add_pending_children(parent, pending)
+        del pending[group]
 
     def _parse_group_name(self, line):
         '''
@@ -317,7 +318,7 @@
 
         try:
             (pattern, port) = parse_address(hostpattern, allow_ranges=True)
-        except:
+        except Exception:
             # not a recognizable host pattern
             pattern = hostpattern
             port = None
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/inventory/script.py ansible-2.4.2.0/lib/ansible/plugins/inventory/script.py
--- ansible-2.4.1.0/lib/ansible/plugins/inventory/script.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/inventory/script.py	2017-11-29 21:10:32.000000000 +0000
@@ -80,8 +80,7 @@
                 (stdout, stderr) = sp.communicate()
 
                 path = to_native(path)
-                if stderr:
-                    err = to_native(stderr) + "\n"
+                err = to_native(stderr or "") + "\n"
 
                 if sp.returncode != 0:
                     raise AnsibleError("Inventory script (%s) had an execution error: %s " % (path, err))
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/inventory/yaml.py ansible-2.4.2.0/lib/ansible/plugins/inventory/yaml.py
--- ansible-2.4.1.0/lib/ansible/plugins/inventory/yaml.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/inventory/yaml.py	2017-11-29 21:10:32.000000000 +0000
@@ -118,19 +118,22 @@
                         raise AnsibleParserError('Invalid %s entry for %s group, requires a dictionary, found %s instead.' %
                                                  (section, group, type(group_data[section])))
 
-            if group_data.get('vars', False):
-                for var in group_data['vars']:
-                    self.inventory.set_variable(group, var, group_data['vars'][var])
+            for key in group_data:
+                if key == 'vars':
+                    for var in group_data['vars']:
+                        self.inventory.set_variable(group, var, group_data['vars'][var])
 
-            if group_data.get('children', False):
-                for subgroup in group_data['children']:
-                    self._parse_group(subgroup, group_data['children'][subgroup])
-                    self.inventory.add_child(group, subgroup)
+                elif key == 'children':
+                    for subgroup in group_data['children']:
+                        self._parse_group(subgroup, group_data['children'][subgroup])
+                        self.inventory.add_child(group, subgroup)
 
-            if group_data.get('hosts', False):
-                for host_pattern in group_data['hosts']:
-                    hosts, port = self._parse_host(host_pattern)
-                    self.populate_host_vars(hosts, group_data['hosts'][host_pattern] or {}, group, port)
+                elif key == 'hosts':
+                    for host_pattern in group_data['hosts']:
+                        hosts, port = self._parse_host(host_pattern)
+                        self.populate_host_vars(hosts, group_data['hosts'][host_pattern] or {}, group, port)
+                else:
+                    self.display.warning('Skipping unexpected key (%s) in group (%s), only "vars", "children" and "hosts" are valid' % (key, group))
 
     def _parse_host(self, host_pattern):
         '''
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/lookup/consul_kv.py ansible-2.4.2.0/lib/ansible/plugins/lookup/consul_kv.py
--- ansible-2.4.1.0/lib/ansible/plugins/lookup/consul_kv.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/lookup/consul_kv.py	2017-11-29 21:10:32.000000000 +0000
@@ -61,7 +61,7 @@
 
 import os
 import sys
-from urlparse import urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 from ansible.errors import AnsibleError
 from ansible.plugins.lookup import LookupBase
 
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/lookup/hashi_vault.py ansible-2.4.2.0/lib/ansible/plugins/lookup/hashi_vault.py
--- ansible-2.4.1.0/lib/ansible/plugins/lookup/hashi_vault.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/lookup/hashi_vault.py	2017-11-29 21:10:32.000000000 +0000
@@ -47,16 +47,24 @@
 """
 
 EXAMPLES = """
-- debug: msg="{{ lookup('hashi_vault', 'secret=secret/hello:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
+- debug:
+    msg: "{{ lookup('hashi_vault', 'secret=secret/hello:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
 
-- name: Vault that requires authentication via ldap
-  debug: msg="{{ lookup('hashi_vault', 'secret=secret/hello:value auth_method=ldap mount_point=ldap username=myuser password=mypas url=http://myvault:8200')}}"
+- name: Return all secrets from a path
+  debug:
+    msg: "{{ lookup('hashi_vault', 'secret=secret/hello token=c975b780-d1be-8016-866b-01d0f9b688a5 url=http://myvault:8200')}}"
+
+- name: Vault that requires authentication via LDAP
+  debug:
+      msg: "{{ lookup('hashi_vault', 'secret=secret/hello:value auth_method=ldap mount_point=ldap username=myuser password=mypas url=http://myvault:8200')}}"
 
 - name: Using an ssl vault
-  debug: msg="{{ lookup('hashi_vault', 'secret=secret/hola:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=https://myvault:8200 validate_certs=False')}}"
+  debug:
+      msg: "{{ lookup('hashi_vault', 'secret=secret/hola:value token=c975b780-d1be-8016-866b-01d0f9b688a5 url=https://myvault:8200 validate_certs=False')}}"
 
 - name: using certificate auth
-  debug: msg="{{ lookup('hashi_vault', 'secret=secret/hi:value token=xxxx-xxx-xxx url=https://myvault:8200 validate_certs=True cacert=/cacert/path/ca.pem')}}"
+  debug:
+      msg: "{{ lookup('hashi_vault', 'secret=secret/hi:value token=xxxx-xxx-xxx url=https://myvault:8200 validate_certs=True cacert=/cacert/path/ca.pem')}}"
 """
 
 RETURN = """
@@ -100,10 +108,10 @@
         if len(s_f) >= 2:
             self.secret_field = s_f[1]
         else:
-            self.secret_field = 'value'
+            self.secret_field = ''
 
-        # if a particular backend is asked for (and its method exists) we call it, otherwise drop through to using
-        # token auth.   this means if a particular auth backend is requested and a token is also given, then we
+        # If a particular backend is asked for (and its method exists) we call it, otherwise drop through to using
+        # token auth. This means if a particular auth backend is requested and a token is also given, then we
         # ignore the token and attempt authentication against the specified backend.
         #
         # to enable a new auth backend, simply add a new 'def auth_<type>' method below.
@@ -143,7 +151,7 @@
         if data is None:
             raise AnsibleError("The secret %s doesn't seem to exist for hashi_vault lookup" % self.secret)
 
-        if self.secret_field == '':  # secret was specified with trailing ':'
+        if self.secret_field == '':
             return data['data']
 
         if self.secret_field not in data['data']:
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/strategy/linear.py ansible-2.4.2.0/lib/ansible/plugins/strategy/linear.py
--- ansible-2.4.1.0/lib/ansible/plugins/strategy/linear.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/strategy/linear.py	2017-11-29 21:10:32.000000000 +0000
@@ -402,7 +402,7 @@
                 if iterator._play.max_fail_percentage is not None and len(results) > 0:
                     percentage = iterator._play.max_fail_percentage / 100.0
 
-                    if (len(self._tqm._failed_hosts) / len(results)) > percentage:
+                    if (len(self._tqm._failed_hosts) / iterator.batch_size) > percentage:
                         for host in hosts_left:
                             # don't double-mark hosts, or the iterator will potentially
                             # fail them out of the rescue/always states
@@ -411,6 +411,7 @@
                                 iterator.mark_host_failed(host)
                         self._tqm.send_callback('v2_playbook_on_no_hosts_remaining')
                         result |= self._tqm.RUN_FAILED_BREAK_PLAY
+                    display.debug('(%s failed / %s total )> %s max fail' % (len(self._tqm._failed_hosts), iterator.batch_size, percentage))
                 display.debug("done checking for max_fail_percentage")
 
                 display.debug("checking to see if all hosts have failed and the running result is not ok")
diff -Nru ansible-2.4.1.0/lib/ansible/plugins/vars/host_group_vars.py ansible-2.4.2.0/lib/ansible/plugins/vars/host_group_vars.py
--- ansible-2.4.1.0/lib/ansible/plugins/vars/host_group_vars.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/plugins/vars/host_group_vars.py	2017-11-29 21:10:32.000000000 +0000
@@ -74,31 +74,33 @@
             else:
                 raise AnsibleParserError("Supplied entity must be Host or Group, got %s instead" % (type(entity)))
 
-            try:
-                found_files = []
-                # load vars
-                opath = os.path.realpath(os.path.join(self._basedir, subdir))
-                key = '%s.%s' % (entity.name, opath)
-                if cache and key in FOUND:
-                    found_files = FOUND[key]
-                else:
-                    b_opath = to_bytes(opath)
-                    # no need to do much if path does not exist for basedir
-                    if os.path.exists(b_opath):
-                        if os.path.isdir(b_opath):
-                            self._display.debug("\tprocessing dir %s" % opath)
-                            found_files = self._find_vars_files(opath, entity.name)
-                            FOUND[key] = found_files
-                        else:
-                            self._display.warning("Found %s that is not a directory, skipping: %s" % (subdir, opath))
-
-                for found in found_files:
-                    new_data = loader.load_from_file(found, cache=True, unsafe=True)
-                    if new_data:  # ignore empty files
-                        data = combine_vars(data, new_data)
+            # avoid 'chroot' type inventory hostnames /path/to/chroot
+            if not entity.name.startswith(os.path.sep):
+                try:
+                    found_files = []
+                    # load vars
+                    opath = os.path.realpath(os.path.join(self._basedir, subdir))
+                    key = '%s.%s' % (entity.name, opath)
+                    if cache and key in FOUND:
+                        found_files = FOUND[key]
+                    else:
+                        b_opath = to_bytes(opath)
+                        # no need to do much if path does not exist for basedir
+                        if os.path.exists(b_opath):
+                            if os.path.isdir(b_opath):
+                                self._display.debug("\tprocessing dir %s" % opath)
+                                found_files = self._find_vars_files(opath, entity.name)
+                                FOUND[key] = found_files
+                            else:
+                                self._display.warning("Found %s that is not a directory, skipping: %s" % (subdir, opath))
+
+                    for found in found_files:
+                        new_data = loader.load_from_file(found, cache=True, unsafe=True)
+                        if new_data:  # ignore empty files
+                            data = combine_vars(data, new_data)
 
-            except Exception as e:
-                raise AnsibleParserError(to_native(e))
+                except Exception as e:
+                    raise AnsibleParserError(to_native(e))
         return data
 
     def _find_vars_files(self, path, name):
@@ -132,7 +134,7 @@
     def _get_dir_files(self, path):
 
         found = []
-        for spath in os.listdir(path):
+        for spath in sorted(os.listdir(path)):
             if not spath.startswith(u'.') and not spath.endswith(u'~'):  # skip hidden and backups
 
                 ext = os.path.splitext(spath)[-1]
diff -Nru ansible-2.4.1.0/lib/ansible/release.py ansible-2.4.2.0/lib/ansible/release.py
--- ansible-2.4.1.0/lib/ansible/release.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/release.py	2017-11-29 21:10:32.000000000 +0000
@@ -19,5 +19,5 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-__version__ = '2.4.1.0'
+__version__ = '2.4.2.0'
 __author__ = 'Ansible, Inc.'
diff -Nru ansible-2.4.1.0/lib/ansible/vars/hostvars.py ansible-2.4.2.0/lib/ansible/vars/hostvars.py
--- ansible-2.4.1.0/lib/ansible/vars/hostvars.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/vars/hostvars.py	2017-11-29 21:10:32.000000000 +0000
@@ -23,6 +23,7 @@
 
 from jinja2.runtime import Undefined
 
+from ansible.module_utils._text import to_bytes
 from ansible.template import Templar
 
 STATIC_VARS = [
@@ -85,7 +86,7 @@
 
     def __getitem__(self, host_name):
         data = self.raw_get(host_name)
-        sha1_hash = sha1(str(data).encode('utf-8')).hexdigest()
+        sha1_hash = sha1(to_bytes(data)).hexdigest()
         if sha1_hash not in self._cached_result:
             templar = Templar(variables=data, loader=self._loader)
             self._cached_result[sha1_hash] = templar.template(data, fail_on_undefined=False, static_vars=STATIC_VARS)
diff -Nru ansible-2.4.1.0/lib/ansible/vars/manager.py ansible-2.4.2.0/lib/ansible/vars/manager.py
--- ansible-2.4.1.0/lib/ansible/vars/manager.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/lib/ansible/vars/manager.py	2017-11-29 21:10:32.000000000 +0000
@@ -72,15 +72,19 @@
     return data
 
 
-def strip_internal_keys(dirty):
+def strip_internal_keys(dirty, exceptions=None):
     '''
     All keys stating with _ansible_ are internal, so create a copy of the 'dirty' dict
     and remove them from the clean one before returning it
     '''
+
+    if exceptions is None:
+        exceptions = ()
     clean = dirty.copy()
     for k in dirty.keys():
         if isinstance(k, string_types) and k.startswith('_ansible_'):
-            del clean[k]
+            if k not in exceptions:
+                del clean[k]
         elif isinstance(dirty[k], dict):
             clean[k] = strip_internal_keys(dirty[k])
     return clean
@@ -228,22 +232,23 @@
             include_delegate_to=include_delegate_to,
         )
 
+        # default for all cases
+        basedirs = [self._loader.get_basedir()]
+
         if play:
             # first we compile any vars specified in defaults/main.yml
             # for all roles within the specified play
             for role in play.get_roles():
                 all_vars = combine_vars(all_vars, role.get_default_vars())
 
-        basedirs = []
         if task:
             # set basedirs
             if C.PLAYBOOK_VARS_ROOT == 'all':  # should be default
                 basedirs = task.get_search_path()
-            elif C.PLAYBOOK_VARS_ROOT == 'top':  # only option pre 2.3
-                basedirs = [self._loader.get_basedir()]
             elif C.PLAYBOOK_VARS_ROOT in ('bottom', 'playbook_dir'):  # only option in 2.4.0
                 basedirs = [task.get_search_path()[0]]
-            else:
+            elif C.PLAYBOOK_VARS_ROOT != 'top':
+                # preserves default basedirs, only option pre 2.3
                 raise AnsibleError('Unkown playbook vars logic: %s' % C.PLAYBOOK_VARS_ROOT)
 
             # if we have a task in this context, and that task has a role, make
@@ -529,10 +534,11 @@
             items = [None]
 
         delegated_host_vars = dict()
+        item_var = getattr(task.loop_control, 'loop_var', 'item')
         for item in items:
             # update the variables with the item value for templating, in case we need it
             if item is not None:
-                vars_copy['item'] = item
+                vars_copy[item_var] = item
 
             templar.set_available_variables(vars_copy)
             delegated_host_name = templar.template(task.delegate_to, fail_on_undefined=False)
diff -Nru ansible-2.4.1.0/packaging/debian/changelog ansible-2.4.2.0/packaging/debian/changelog
--- ansible-2.4.1.0/packaging/debian/changelog	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/packaging/debian/changelog	2017-11-29 21:10:32.000000000 +0000
@@ -4,6 +4,13 @@
 
  -- Ansible, Inc. <info@ansible.com>  %DATE%
 
+ansible (2.4.2.0) unstable; urgency=low
+
+  * 2.4.2.0
+
+ -- Ansible, Inc. <info@ansible.com>  Wed, 29 Nov 2017 12:18:55 -0800
+
+
 ansible (2.4.1.0) unstable; urgency=low
 
   * 2.4.1.0
diff -Nru ansible-2.4.1.0/packaging/release/vars/versions.yml ansible-2.4.2.0/packaging/release/vars/versions.yml
--- ansible-2.4.1.0/packaging/release/vars/versions.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/packaging/release/vars/versions.yml	2017-11-29 21:10:32.000000000 +0000
@@ -6,6 +6,7 @@
 - "2.4":
     code_name: "Dancing Days"
     releases:
+    - "2": "11-29-2017"
     - "1": "10-25-2017"
     - "0": "09-19-2017"
 - "2.3":
diff -Nru ansible-2.4.1.0/packaging/requirements/requirements-azure.txt ansible-2.4.2.0/packaging/requirements/requirements-azure.txt
--- ansible-2.4.1.0/packaging/requirements/requirements-azure.txt	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/packaging/requirements/requirements-azure.txt	2017-11-29 21:10:32.000000000 +0000
@@ -13,4 +13,4 @@
 azure-mgmt-batch>=4.1.0,<5
 azure-mgmt-sql>=0.7.1,<0.8
 azure-mgmt-web>=0.32.0,<0.33
-azure-mgmt-containerservice>=1.0.0
\ No newline at end of file
+azure-mgmt-containerservice>=1.0.0,<2.0.0
\ No newline at end of file
diff -Nru ansible-2.4.1.0/packaging/rpm/ansible.spec ansible-2.4.2.0/packaging/rpm/ansible.spec
--- ansible-2.4.1.0/packaging/rpm/ansible.spec	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/packaging/rpm/ansible.spec	2017-11-29 21:10:32.000000000 +0000
@@ -2,7 +2,7 @@
 %define ansible_version $VERSION
 
 %if 0%{?rhel} == 5
-%define __python /usr/bin/python26
+%define __python2 /usr/bin/python26
 %endif
 
 Name:      %{name}
@@ -14,6 +14,7 @@
 Group:     Development/Libraries
 Source:    http://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+%{!?__python2: %global __python2 /usr/bin/python2.6}
 %{!?python_sitelib: %global python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 BuildArch: noarch
@@ -135,6 +136,9 @@
 
 %changelog
 
+* Wed Nov 29 2017 Ansible, Inc. <info@ansible.com> - 2.4.2.0-1
+- Release 2.4.2.0-1
+
 * Wed Oct 25 2017 Ansible, Inc. <info@ansible.com> - 2.4.1.0-1
 - Release 2.4.1.0-1
 
diff -Nru ansible-2.4.1.0/PKG-INFO ansible-2.4.2.0/PKG-INFO
--- ansible-2.4.1.0/PKG-INFO	2017-10-26 05:56:43.000000000 +0000
+++ ansible-2.4.2.0/PKG-INFO	2017-11-29 21:11:07.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ansible
-Version: 2.4.1.0
+Version: 2.4.2.0
 Summary: Radically simple IT automation
 Home-page: https://ansible.com/
 Author: Ansible, Inc.
diff -Nru ansible-2.4.1.0/SYMLINK_CACHE.json ansible-2.4.2.0/SYMLINK_CACHE.json
--- ansible-2.4.1.0/SYMLINK_CACHE.json	2017-10-26 05:56:40.000000000 +0000
+++ ansible-2.4.2.0/SYMLINK_CACHE.json	2017-11-29 21:11:06.000000000 +0000
@@ -1 +1 @@
-{"library": {"ovirt_disk.py": ["ansible/modules/cloud/ovirt/_ovirt_disks.py"], "ec2_vpc_dhcp_option.py": ["ansible/modules/cloud/amazon/_ec2_vpc_dhcp_options.py"], "ovirt_datacenter_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_datacenters_facts.py"], "ovirt_cluster_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_clusters_facts.py"], "aws_s3.py": ["ansible/modules/cloud/amazon/_s3.py"], "ovirt_affinity_label_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_affinity_labels_facts.py"], "ovirt_group_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_groups_facts.py"], "ovirt_external_provider_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_external_providers_facts.py"], "iam_server_certificate_facts.py": ["ansible/modules/cloud/amazon/_iam_cert_facts.py"], "ovirt_affinity_label.py": ["ansible/modules/cloud/ovirt/_ovirt_affinity_labels.py"], "ovirt_group.py": ["ansible/modules/cloud/ovirt/_ovirt_groups.py"], "ovirt_cluster.py": ["ansible/modules/cloud/ovirt/_ovirt_clusters.py"], "ec2_vpc_dhcp_option_facts.py": ["ansible/modules/cloud/amazon/_ec2_vpc_dhcp_options_facts.py"], "ovirt_external_provider.py": ["ansible/modules/cloud/ovirt/_ovirt_external_providers.py"], "os_server_action.py": ["ansible/modules/cloud/openstack/_os_server_actions.py"], "ec2_metadata_facts.py": ["ansible/modules/cloud/amazon/_ec2_facts.py"], "ovirt_datacenter.py": ["ansible/modules/cloud/ovirt/_ovirt_datacenters.py"], "ovirt_affinity_group.py": ["ansible/modules/cloud/ovirt/_ovirt_affinity_groups.py"]}, "script": {"ansible": ["ansible-config", "ansible-pull", "ansible-inventory", "ansible-playbook", "ansible-vault", "ansible-doc", "ansible-galaxy", "ansible-console"]}}
\ No newline at end of file
+{"library": {"ovirt_disk.py": ["ansible/modules/cloud/ovirt/_ovirt_disks.py"], "ec2_vpc_dhcp_option.py": ["ansible/modules/cloud/amazon/_ec2_vpc_dhcp_options.py"], "ovirt_external_provider.py": ["ansible/modules/cloud/ovirt/_ovirt_external_providers.py"], "ovirt_cluster.py": ["ansible/modules/cloud/ovirt/_ovirt_clusters.py"], "ovirt_group_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_groups_facts.py"], "aws_s3.py": ["ansible/modules/cloud/amazon/_s3.py"], "ovirt_affinity_label_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_affinity_labels_facts.py"], "ovirt_cluster_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_clusters_facts.py"], "ovirt_external_provider_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_external_providers_facts.py"], "iam_server_certificate_facts.py": ["ansible/modules/cloud/amazon/_iam_cert_facts.py"], "ovirt_affinity_label.py": ["ansible/modules/cloud/ovirt/_ovirt_affinity_labels.py"], "ovirt_group.py": ["ansible/modules/cloud/ovirt/_ovirt_groups.py"], "ec2_vpc_dhcp_option_facts.py": ["ansible/modules/cloud/amazon/_ec2_vpc_dhcp_options_facts.py"], "ovirt_datacenter_facts.py": ["ansible/modules/cloud/ovirt/_ovirt_datacenters_facts.py"], "ovirt_affinity_group.py": ["ansible/modules/cloud/ovirt/_ovirt_affinity_groups.py"], "ec2_metadata_facts.py": ["ansible/modules/cloud/amazon/_ec2_facts.py"], "ovirt_datacenter.py": ["ansible/modules/cloud/ovirt/_ovirt_datacenters.py"], "os_server_action.py": ["ansible/modules/cloud/openstack/_os_server_actions.py"]}, "script": {"ansible": ["ansible-config", "ansible-console", "ansible-doc", "ansible-galaxy", "ansible-inventory", "ansible-playbook", "ansible-pull", "ansible-vault"]}}
\ No newline at end of file
diff -Nru ansible-2.4.1.0/test/integration/nxos.yaml ansible-2.4.2.0/test/integration/nxos.yaml
--- ansible-2.4.1.0/test/integration/nxos.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/nxos.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -80,6 +80,33 @@
 
     - block:
       - include_role:
+          name: nxos_udld
+        when: "limit_to in ['*', 'nxos_udld']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_udld' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_udld_interface
+        when: "limit_to in ['*', 'nxos_udld_interface']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_udld_interface' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_vxlan_vtep_vni
+        when: "limit_to in ['*', 'nxos_vxlan_vtep_vni']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_vxlan_vtep_vni' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
           name: nxos_mtu
         when: "limit_to in ['*', 'nxos_mtu']"
       rescue:
@@ -224,6 +251,42 @@
 
     - block:
       - include_role:
+          name: nxos_snmp_user
+        when: "limit_to in ['*', 'nxos_snmp_user']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_snmp_user' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_snapshot
+        when: "limit_to in ['*', 'nxos_snapshot']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_snapshot' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_hsrp
+        when: "limit_to in ['*', 'nxos_hsrp']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_hsrp' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_static_route
+        when: "limit_to in ['*', 'nxos_static_route']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_static_route' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
           name: nxos_rollback
         when: "limit_to in ['*', 'nxos_rollback']"
       rescue:
@@ -313,6 +376,60 @@
 
     - block:
       - include_role:
+          name: nxos_file_copy
+        when: "limit_to in ['*', 'nxos_file_copy']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_file_copy' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_igmp_interface
+        when: "limit_to in ['*', 'nxos_igmp_interface']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_igmp_interface' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_igmp
+        when: "limit_to in ['*', 'nxos_igmp']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_igmp' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_igmp_snooping
+        when: "limit_to in ['*', 'nxos_igmp_snooping']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_igmp_snooping' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_ntp_auth
+        when: "limit_to in ['*', 'nxos_ntp_auth']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_ntp_auth' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
+          name: nxos_ntp_options
+        when: "limit_to in ['*', 'nxos_ntp_options']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_ntp_options' ]"
+            test_failed: true
+
+    - block:
+      - include_role:
           name: nxos_logging
         when: "limit_to in ['*', 'nxos_logging']"
       rescue:
@@ -366,6 +483,23 @@
         when: "limit_to in ['*', 'nxos_snmp_community']"
       rescue:
         - set_fact: test_failed=true
+
+    - block:
+      - include_role:
+          name: nxos_snmp_location
+        when: "limit_to in ['*', 'nxos_snmp_location']"
+      rescue:
+        - set_fact: test_failed=true
+
+    - block:
+      - include_role:
+          name: nxos_snmp_host
+        when: "limit_to in ['*', 'nxos_snmp_host']"
+      rescue:
+        - set_fact:
+            failed_modules: "{{ failed_modules }} + [ 'nxos_snmp_host' ]"
+            test_failed: true
+
 ###########
     - debug: var=failed_modules
       when: test_failed
diff -Nru ansible-2.4.1.0/test/integration/targets/aws_s3/aliases ansible-2.4.2.0/test/integration/targets/aws_s3/aliases
--- ansible-2.4.1.0/test/integration/targets/aws_s3/aliases	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/aws_s3/aliases	2017-11-29 21:10:32.000000000 +0000
@@ -1 +1,2 @@
 cloud/aws
+posix/ci/cloud/group1/aws
diff -Nru ansible-2.4.1.0/test/integration/targets/aws_s3/tasks/main.yml ansible-2.4.2.0/test/integration/targets/aws_s3/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/aws_s3/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/aws_s3/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -67,10 +67,6 @@
       - result.changed == True
       - result.msg == "PUT operation complete"
 # ============================================================
-- name: wait a few seconds before continuing
-  pause:
-    seconds: 3
-# ============================================================
 - name: create a second temp file to download the object from the bucket
   tempfile:
   register: tmp2
@@ -96,10 +92,6 @@
     that:
       - file1stat.stat.checksum == file2stat.stat.checksum
 # ============================================================
-- name: wait a few seconds before continuing
-  pause:
-      seconds: 3
-# ============================================================
 - name: test geturl of the object
   s3:
     bucket: "{{ bucket.stdout }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/cs_router/tasks/main.yml ansible-2.4.2.0/test/integration/targets/cs_router/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/cs_router/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/cs_router/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -49,12 +49,8 @@
     - instance.name == "instance-vm"
     - instance.state == "Running"
 
-- name: install jq
-  package:
-    name: jq
-
 - name: setup find the routers name
-  shell: cs listRouters listall=true networkid="{{ net.id }}" zone="{{ cs_common_zone_adv }}" | jq ".router[].name" | tr -d '"'
+  shell: cs listRouters listall=true networkid="{{ net.id }}" zone="{{ cs_common_zone_adv }}"
   args:
     chdir: "{{ playbook_dir }}"
   register: router
@@ -63,7 +59,10 @@
     var: router.stdout
 
 - set_fact:
-    router_name: "{{ router.stdout }}"
+    router_json: "{{ router.stdout | from_json }}"
+
+- set_fact:
+    router_name: "{{ router_json.router[0].name }}"
 
 - name: test router started
   cs_router:
diff -Nru ansible-2.4.1.0/test/integration/targets/eos_user/tests/cli/basic.yaml ansible-2.4.2.0/test/integration/targets/eos_user/tests/cli/basic.yaml
--- ansible-2.4.1.0/test/integration/targets/eos_user/tests/cli/basic.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/eos_user/tests/cli/basic.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -5,9 +5,10 @@
       - no username ansibletest1
       - no username ansibletest2
       - no username ansibletest3
+      - no username ansibletest4
     provider: "{{ cli }}"
 
-- name: Create user
+- name: Create user with role
   eos_user:
     name: ansibletest1
     privilege: 15
@@ -22,9 +23,27 @@
     that:
       - 'result.changed == true'
       - '"username" in result.commands[0]'
-      - '"role network-operator" in result.commands[0]'
+      - '"secret" in result.commands[0]'
+      - '"role network-operator" in result.commands[1]'
+      - '"privilege 15" in result.commands[2]'
+
+- name: Create user with priv level and update_password
+  eos_user:
+    name: ansibletest4
+    privilege: 15
+    state: present
+    configured_password: test1
+    authorize: yes
+    update_password: on_create
+    provider: "{{ cli }}"
+  register: result
+
+- assert:
+    that:
+      - 'result.changed == true'
+      - '"username" in result.commands[0]'
+      - '"secret" in result.commands[0]'
       - '"privilege 15" in result.commands[1]'
-      - '"secret" in result.commands[2]'
 
 - name: Collection of users
   eos_user:
@@ -41,11 +60,11 @@
     that:
       - 'result.changed == true'
       - '"username" in result.commands[0]'
-      - '"role network-operator" in result.commands[0]'
-      - '"secret" in result.commands[1]'
+      - '"role network-operator" in result.commands[1]'
+      - '"secret" in result.commands[0]'
       - '"username" in result.commands[2]'
-      - '"role network-operator" in result.commands[2]'
-      - '"secret" in result.commands[3]'
+      - '"role network-operator" in result.commands[3]'
+      - '"secret" in result.commands[2]'
 
 - name: Add user without password or nopassword arg(Should fail)
   eos_user:
@@ -69,4 +88,5 @@
       - no username ansibletest1
       - no username ansibletest2
       - no username ansibletest3
+      - no username ansibletest4
     provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_banner/tests/cli/basic-login.yaml ansible-2.4.2.0/test/integration/targets/ios_banner/tests/cli/basic-login.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_banner/tests/cli/basic-login.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_banner/tests/cli/basic-login.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -5,7 +5,6 @@
     banner: login
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: Set login
   ios_banner:
@@ -16,7 +15,6 @@
       string
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - debug:
@@ -36,7 +34,6 @@
       string
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_banner/tests/cli/basic-motd.yaml ansible-2.4.2.0/test/integration/targets/ios_banner/tests/cli/basic-motd.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_banner/tests/cli/basic-motd.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_banner/tests/cli/basic-motd.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -4,7 +4,6 @@
   ios_banner:
     banner: motd
     state: absent
-    provider: "{{ cli }}"
     authorize: yes
 
 - name: Set motd
@@ -16,7 +15,6 @@
       string
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - debug:
@@ -36,7 +34,6 @@
       string
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_banner/tests/cli/basic-no-login.yaml ansible-2.4.2.0/test/integration/targets/ios_banner/tests/cli/basic-no-login.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_banner/tests/cli/basic-no-login.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_banner/tests/cli/basic-no-login.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,14 +7,12 @@
       over multiple lines
     state: present
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: remove login
   ios_banner:
     banner: login
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - debug:
@@ -30,7 +28,6 @@
     banner: login
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/bad_operator.yaml ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/bad_operator.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/bad_operator.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/bad_operator.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,6 +6,7 @@
     commands:
       - show version
       - show interfaces GigabitEthernet 0/0
+    authorize: yes
     wait_for:
       - "result[0] contains 'Description: Foo'"
   register: result
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/contains.yaml ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/contains.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/contains.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/contains.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,6 +6,7 @@
     commands:
       - show version
       - show interface loopback 888
+    authorize: yes
     wait_for:
       - "result[0] contains Cisco"
       - "result[1] contains Loopback888"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/invalid.yaml ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/invalid.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/invalid.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/invalid.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -4,6 +4,7 @@
 - name: run invalid command
   ios_command:
     commands: show foo
+    authorize: yes
   register: result
   ignore_errors: yes
 
@@ -16,6 +17,7 @@
     commands:
       - show version
       - show foo
+    authorize: yes
   register: result
   ignore_errors: yes
 
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/output.yaml ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/output.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/output.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/output.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -5,6 +5,7 @@
   ios_command:
     commands:
       - show version
+    authorize: yes
   register: result
 
 - assert:
@@ -17,6 +18,7 @@
     commands:
       - show version
       - show interfaces
+    authorize: yes
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/timeout.yaml ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/timeout.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_command/tests/cli/timeout.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_command/tests/cli/timeout.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -5,6 +5,7 @@
   ios_command:
     commands:
       - show version
+    authorize: yes
     wait_for:
       - "result[0] contains bad_value_string"
   register: result
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/backup.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/backup.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/backup.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/backup.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -9,7 +9,7 @@
     parents:
       - interface Loopback999
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: collect any backup files
   find:
@@ -28,7 +28,7 @@
   ios_config:
     src: basic/config.j2
     backup: yes
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/defaults.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/defaults.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/defaults.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/defaults.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -9,13 +9,13 @@
     parents:
       - interface Loopback999
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure device with defaults included
   ios_config:
     src: defaults/config.j2
     defaults: yes
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - debug: var=result
@@ -30,7 +30,7 @@
   ios_config:
     src: defaults/config.j2
     defaults: yes
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - debug: var=result
@@ -40,4 +40,23 @@
       - "result.changed == false"
       - "result.updates is not defined"
 
+- name: Check device is in proper prompt after error
+  ios_config:
+    lines:
+        - mac-address-table notification mac-move
+    authorize: yes
+  ignore_errors: yes
+
+- name: show interfaces brief to ensure deivce goes to valid prompt
+  ios_command:
+    commands:
+      - show interfaces
+    authorize: yes
+  register: result
+
+- assert:
+    that:
+      - "result.changed == false"
+      - "result.stdout is defined"
+
 - debug: msg="END cli/defaults.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/save.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/save.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/save.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/save.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -9,13 +9,13 @@
     parents:
       - interface Loopback999
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 
 - name: save config
   ios_config:
     save: true
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 # FIXME https://github.com/ansible/ansible-modules-core/issues/5008
   ignore_errors: true
@@ -29,15 +29,38 @@
 - name: save should always run
   ios_config:
     save: true
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 # FIXME https://github.com/ansible/ansible-modules-core/issues/5008
   ignore_errors: true
 
+- name: delete config (setup)
+  ios_config:
+    replace: line
+    lines:
+      - "no ip http server"
+    save_when: modified
+    authorize: yes
+  register: result
+
+- name: save should always run
+  ios_config:
+    replace: line
+    lines:
+      - "ip http server"
+    save_when: modified
+    authorize: yes
+  register: result
+
 - assert:
     that:
       - "result.changed == true"
-# FIXME https://github.com/ansible/ansible-modules-core/issues/5008
-  ignore_errors: true
+
+- name: teardown
+  ios_config:
+    lines:
+      - "no ip http server"
+    authorize: yes
+  register: result
 
 - debug: msg="END cli/save.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/src_basic.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/src_basic.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/src_basic.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/src_basic.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -9,12 +9,12 @@
     parents:
       - interface Loopback999
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure device with config
   ios_config:
     src: basic/config.j2
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - name: debug, remove me
@@ -30,7 +30,7 @@
 - name: check device with config
   ios_config:
     src: basic/config.j2
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/src_invalid.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/src_invalid.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/src_invalid.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/src_invalid.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,6 +6,7 @@
 - name: configure with invalid src
   ios_config:
     src: basic/foobar.j2
+    authorize: yes
   register: result
   ignore_errors: yes
 
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/src_match_none.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/src_match_none.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/src_match_none.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/src_match_none.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -9,13 +9,13 @@
     parents:
       - interface Loopback999
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure device with config
   ios_config:
     src: basic/config.j2
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -28,7 +28,7 @@
 - name: check device with config
   ios_config:
     src: basic/config.j2
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel_block.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel_block.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel_block.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel_block.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -10,7 +10,7 @@
     parents: ['ip access-list extended test']
     before: ['no ip access-list extended test']
     after: ['exit']
-    provider: "{{ cli }}"
+    authorize: yes
     match: none
 
 - name: configure sub level command using block resplace
@@ -23,7 +23,7 @@
     parents: ['ip access-list extended test']
     replace: block
     after: ['exit']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -45,7 +45,7 @@
     parents: ['ip access-list extended test']
     replace: block
     after: ['exit']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -57,6 +57,6 @@
     lines:
       - no ip access-list extended test
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/sublevel_block.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel_exact.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel_exact.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel_exact.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel_exact.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -13,7 +13,7 @@
     before: no ip access-list extended test
     after: exit
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure sub level command using exact match
   ios_config:
@@ -26,7 +26,7 @@
     before: no ip access-list extended test
     after: exit
     match: exact
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -48,7 +48,7 @@
       - permit ip host 4.4.4.4 any log
     parents: ip access-list extended test
     match: exact
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -60,6 +60,6 @@
     lines:
       - no ip access-list extended test
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/sublevel_exact.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel_strict.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel_strict.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel_strict.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel_strict.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -12,7 +12,7 @@
     parents: ip access-list extended test
     before: no ip access-list extended test
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure sub level command using strict match
   ios_config:
@@ -23,7 +23,7 @@
       - permit ip host 4.4.4.4 any log
     parents: ip access-list extended test
     match: strict
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -39,7 +39,7 @@
     parents: ip access-list extended test
     after: exit
     match: strict
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -56,6 +56,6 @@
   ios_config:
     lines: no ip access-list extended test
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/sublevel_strict.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/sublevel.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/sublevel.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,13 +7,13 @@
       - 'no ip access-list extended test'
       - 'no ip access-list standard test'
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure sub level command
   ios_config:
     lines: ['permit ip any any log']
     parents: ['ip access-list extended test']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -26,7 +26,7 @@
   ios_config:
     lines: ['permit ip any any log']
     parents: ['ip access-list extended test']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -38,6 +38,6 @@
     lines:
       - 'no ip access-list extended test'
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/sublevel.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel_after.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel_after.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel_after.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel_after.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,13 +7,13 @@
       - "snmp-server contact ansible"
       - "hostname {{ shorter_hostname }}"
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure top level command with before
   ios_config:
     lines: ['hostname foo']
     after: ['snmp-server contact bar']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -26,7 +26,7 @@
   ios_config:
     lines: ['hostname foo']
     after: ['snmp-server contact foo']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -39,6 +39,6 @@
       - "no snmp-server contact"
       - "hostname {{ shorter_hostname }}"
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/toplevel_after.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel_before.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel_before.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel_before.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel_before.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,13 +7,13 @@
       - "snmp-server contact ansible"
       - "hostname {{ shorter_hostname }}"
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure top level command with before
   ios_config:
     lines: ['hostname foo']
     before: ['snmp-server contact bar']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -26,7 +26,7 @@
   ios_config:
     lines: ['hostname foo']
     before: ['snmp-server contact foo']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -39,6 +39,6 @@
       - "no snmp-server contact"
       - "hostname {{ shorter_hostname }}"
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/toplevel_before.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel_nonidempotent.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel_nonidempotent.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel_nonidempotent.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel_nonidempotent.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -5,13 +5,13 @@
   ios_config:
     lines: ['hostname {{ shorter_hostname }}']
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure top level command
   ios_config:
     lines: ['hostname foo']
     match: strict
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -23,7 +23,7 @@
   ios_config:
     lines: ['hostname foo']
     match: strict
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -34,6 +34,6 @@
   ios_config:
     lines: ['hostname {{ shorter_hostname }}']
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/toplevel_nonidempotent.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel.yaml ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_config/tests/cli/toplevel.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_config/tests/cli/toplevel.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -5,12 +5,12 @@
   ios_config:
     lines: ['hostname {{ shorter_hostname }}']
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - name: configure top level command
   ios_config:
     lines: ['hostname foo']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -21,7 +21,7 @@
 - name: configure top level command idempotent check
   ios_config:
     lines: ['hostname foo']
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
@@ -32,6 +32,6 @@
   ios_config:
     lines: ['hostname {{ shorter_hostname }}']
     match: none
-    provider: "{{ cli }}"
+    authorize: yes
 
 - debug: msg="END cli/toplevel.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/all_facts.yaml ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/all_facts.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/all_facts.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/all_facts.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,7 +6,7 @@
   ios_facts:
     gather_subset:
       - all
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/default_facts.yaml ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/default_facts.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/default_facts.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/default_facts.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -4,7 +4,7 @@
 
 - name: test getting default facts
   ios_facts:
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/invalid_subset.yaml ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/invalid_subset.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/invalid_subset.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/invalid_subset.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,7 +6,7 @@
   ios_facts:
     gather_subset:
       - "foobar"
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
   ignore_errors: true
 
@@ -29,7 +29,7 @@
     gather_subset:
       - "!hardware"
       - "hardware"
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
   ignore_errors: true
 
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/not_hardware.yaml ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/not_hardware.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_facts/tests/cli/not_hardware.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_facts/tests/cli/not_hardware.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,7 +6,7 @@
   ios_facts:
     gather_subset:
       - "!hardware"
-    provider: "{{ cli }}"
+    authorize: yes
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_interface/tests/cli/basic.yaml ansible-2.4.2.0/test/integration/targets/ios_interface/tests/cli/basic.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_interface/tests/cli/basic.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_interface/tests/cli/basic.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,40 +1,69 @@
 ---
 - debug: msg="START ios_interface cli/basic.yaml"
 
+- name: Run show version
+  ios_command:
+    commands: show version
+    authorize: yes
+  register: show_version_result
+
+- block:
+    - name: Set test interface to GigabitEthernet0/1 as we are on Cisco IOS
+      set_fact: test_interface=GigabitEthernet0/1
+    - name: Set test interface 2 to GigabitEthernet0/2 as we are on Cisco IOS
+      set_fact: test_interface2=GigabitEthernet0/2
+  when: "'Cisco IOS' in show_version_result.stdout[0]"
+
+- block:
+    - name: Set test interface to GigabitEthernet2 as we are on Cisco IOS-XE
+      set_fact: test_interface=GigabitEthernet2
+    - name: Disable autonegotiation on GigabitEthernet2
+      ios_config:
+        lines:
+          - no negotiation auto
+        parents: int GigabitEthernet2
+        authorize: yes
+
+    - name: Set test interface 2 to GigabitEthernet3 as we are on Cisco IOS-XE
+      set_fact: test_interface2=GigabitEthernet3
+    - name: Disable autonegotiation on GigabitEthernet3
+      ios_config:
+        lines:
+          - no negotiation auto
+        parents: int GigabitEthernet3
+        authorize: yes
+  when: "'Cisco IOS-XE' in show_version_result.stdout[0]"
+
 - name: Configure interface (setup)
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     description: test-interface-1
-    speed: 10
-    duplex: full
-    mtu: 256
+    speed: 1000
+    mtu: 1800
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
-- name: Confgure interface
+- name: Configure interface
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     description: test-interface-initial
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"description test-interface-initial" in result.commands'
 
 - name: Confgure interface (idempotent)
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     description: test-interface-initial
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -43,120 +72,99 @@
 
 - name: Confgure interface parameters
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     description: test-interface
-    speed: 100
-    mtu: 512
+    mtu: 2000
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"description test-interface" in result.commands'
-      - '"speed 100" in result.commands'
-      - '"mtu 512" in result.commands'
+      - '"mtu 2000" in result.commands'
 
 - name: Change interface parameters
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     description: test-interface-1
-    speed: 10
-    duplex: half
-    mtu: 256
+    mtu: 1800
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"description test-interface-1" in result.commands'
-      - '"speed 10" in result.commands'
-      - '"duplex half" in result.commands'
-      - '"mtu 256" in result.commands'
+      - '"mtu 1800" in result.commands'
 
 - name: Disable interface
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     enabled: False
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"shutdown" in result.commands'
 
 - name: Enable interface
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     enabled: True
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"no shutdown" in result.commands'
 
 - name: Confgure second interface (setup)
   ios_interface:
-    name: GigabitEthernet0/1
+    name: "{{ test_interface2 }}"
     description: test-interface-initial
-    speed: 100
-    duplex: half
-    mtu: 516
+    speed: 1000
+    mtu: 1800
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - name: Add interface aggregate
   ios_interface:
     aggregate:
-    - { name: GigabitEthernet0/1, mtu: 256, description: test-interface-1 }
-    - { name: GigabitEthernet0/2, mtu: 516, description: test-interface-2 }
-    duplex: full
-    speed: 100
+    - { name: "{{ test_interface }}", mtu: 2000, description: test-interface-1 }
+    - { name: "{{ test_interface2 }}", mtu: 2000, description: test-interface-2 }
+    speed: 1000
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/1" in result.commands'
-      - '"speed 100" in result.commands'
-      - '"description test-interface-1" in result.commands'
-      - '"duplex full" in result.commands'
-      - '"mtu 256" in result.commands'
-      - '"interface GigabitEthernet0/2" in result.commands'
-      - '"speed 100" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
+      - '"mtu 2000" in result.commands'
+      - '"interface {{ test_interface2 }}" in result.commands'
       - '"description test-interface-2" in result.commands'
-      - '"duplex full" in result.commands'
-      - '"mtu 516" in result.commands'
+      - '"mtu 2000" in result.commands'
 
 - name: Add interface aggregate (idempotent)
   ios_interface:
     aggregate:
-    - { name: GigabitEthernet0/1, mtu: 256, description: test-interface-1 }
-    - { name: GigabitEthernet0/2, mtu: 516, description: test-interface-2 }
-    duplex: full
-    speed: 100
+    - { name: "{{ test_interface }}", mtu: 2000, description: test-interface-1 }
+    - { name: "{{ test_interface2 }}", mtu: 2000, description: test-interface-2 }
+    speed: 1000
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -166,39 +174,37 @@
 - name: Disable interface aggregate
   ios_interface:
     aggregate:
-    - name: GigabitEthernet0/1
-    - name: GigabitEthernet0/2
+    - { name: "{{ test_interface }}" }
+    - { name: "{{ test_interface2 }}" }
     enabled: False
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/1" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"shutdown" in result.commands'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface2 }}" in result.commands'
       - '"shutdown" in result.commands'
 
 - name: Enable interface aggregate
   ios_interface:
     aggregate:
-    - name: GigabitEthernet0/1
-    - name: GigabitEthernet0/2
+    - { name: "{{ test_interface }}" }
+    - { name: "{{ test_interface2 }}" }
     enabled: True
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
-      - '"interface GigabitEthernet0/1" in result.commands'
+      - '"interface {{ test_interface }}" in result.commands'
       - '"no shutdown" in result.commands'
-      - '"interface GigabitEthernet0/2" in result.commands'
+      - '"interface {{ test_interface2 }}" in result.commands'
       - '"no shutdown" in result.commands'
 
 - name: loopback interface setup
@@ -216,7 +222,6 @@
     - name: Loopback10
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -232,7 +237,6 @@
     - name: Loopback10
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -248,7 +252,6 @@
     - name: Loopback10
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_interface/tests/cli/intent.yaml ansible-2.4.2.0/test/integration/targets/ios_interface/tests/cli/intent.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_interface/tests/cli/intent.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_interface/tests/cli/intent.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,14 +1,28 @@
 ---
 - debug: msg="START ios_interface cli/intent.yaml"
 
+- name: Run show version
+  ios_command:
+    commands: show version
+    authorize: yes
+  register: show_version_result
+
+- name: Set test interface to GigabitEthernet0/2 if we are on Cisco IOS
+  set_fact: test_interface=GigabitEthernet0/2
+  when: "'Cisco IOS' in show_version_result.stdout[0]"
+
+- name: Set test interface to GigabitEthernet2 if we are on Cisco IOS-XE
+  set_fact: test_interface=GigabitEthernet2
+  when: "'Cisco IOS-XE' in show_version_result.stdout[0]"
+
+
 - name: Check intent arguments
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     state: up
     tx_rate: ge(0)
     rx_rate: le(0)
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -17,12 +31,11 @@
 
 - name: Check intent arguments (failed condition)
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     state: down
     tx_rate: gt(0)
     rx_rate: lt(0)
     authorize: yes
-    provider: "{{ cli }}"
   ignore_errors: yes
   register: result
 
@@ -35,11 +48,10 @@
 
 - name: Config + intent
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     enabled: False
     state: down
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -48,11 +60,10 @@
 
 - name: Config + intent (fail)
   ios_interface:
-    name: GigabitEthernet0/2
+    name: "{{ test_interface }}"
     enabled: False
     authorize: yes
     state: up
-    provider: "{{ cli }}"
   ignore_errors: yes
   register: result
 
@@ -61,45 +72,51 @@
       - "result.failed == true"
       - "'state eq(up)' in result.failed_conditions"
 
-- name: Check neighbors intent arguments
-  ios_interface:
-    name: Gi0/0
-    neighbors:
-    - port: eth0
-      host: netdev
-    authorize: yes
-    provider: "{{ cli }}"
-  register: result
-
-- assert:
-    that:
-      - "result.failed == false"
-
-- name: Check neighbors intent arguments (failed condition)
-  ios_interface:
-    name: Gi0/0
-    neighbors:
-    - port: dummy_port
-      host: dummy_host
-    authorize: yes
-    provider: "{{ cli }}"
-  ignore_errors: yes
-  register: result
-
-- assert:
-    that:
-      - "result.failed == true"
-      - "'host dummy_host' in result.failed_conditions"
-      - "'port dummy_port' in result.failed_conditions"
+- name: Register show neighbors detail
+  ios_command:
+    commands:
+      - show lldp neighbors
+    authorize: yes
+  register: show_lldp_neighbors_result
+
+- block:
+    - name: Check neighbors intent arguments
+      ios_interface:
+        name: Gi0/0
+        neighbors:
+          - port: eth0
+            host: netdev
+        authorize: yes
+      register: result
+
+    - assert:
+        that:
+          - "result.failed == false"
+
+    - name: Check neighbors intent arguments (failed condition)
+      ios_interface:
+        name: Gi0/0
+        neighbors:
+          - port: dummy_port
+            host: dummy_host
+        authorize: yes
+      ignore_errors: yes
+      register: result
+
+    - assert:
+        that:
+          - "result.failed == true"
+          - "'host dummy_host' in result.failed_conditions"
+          - "'port dummy_port' in result.failed_conditions"
+  when: '"netdev" in show_lldp_neighbors_result.stdout'
 
 - name: Aggregate config + intent (pass)
   ios_interface:
     aggregate:
-    - name: GigabitEthernet0/2
-      enabled: True
-      state: up
+      - name: "{{ test_interface }}"
+        enabled: True
+        state: up
     authorize: yes
-    provider: "{{ cli }}"
   ignore_errors: yes
   register: result
 
@@ -107,38 +124,38 @@
     that:
       - "result.failed == false"
 
-- name: Aggregate neighbors intent (pass)
-  ios_interface:
-    aggregate:
-    - name: Gi0/0
-      neighbors:
-      - port: eth0
-        host: netdev
-    authorize: yes
-    provider: "{{ cli }}"
-  ignore_errors: yes
-  register: result
-
-- assert:
-    that:
-      - "result.failed == false"
-
-- name: Aggregate neighbors intent (fail)
-  ios_interface:
-    aggregate:
-    - name: Gi0/0
-      neighbors:
-      - port: eth0
-        host: netdev
-      - port: dummy_port
-        host: dummy_host
-    authorize: yes
-    provider: "{{ cli }}"
-  ignore_errors: yes
-  register: result
-
-- assert:
-    that:
-      - "result.failed == true"
-      - "'host dummy_host' in result.failed_conditions"
-      - "'port dummy_port' in result.failed_conditions"
+- block:
+    - name: Aggregate neighbors intent (pass)
+      ios_interface:
+        aggregate:
+          - name: Gi0/0
+            neighbors:
+              - port: eth0
+                host: netdev
+        authorize: yes
+      ignore_errors: yes
+      register: result
+
+    - assert:
+        that:
+          - "result.failed == false"
+
+    - name: Aggregate neighbors intent (fail)
+      ios_interface:
+        aggregate:
+          - name: Gi0/0
+        neighbors:
+          - port: eth0
+            host: netdev
+          - port: dummy_port
+            host: dummy_host
+        authorize: yes
+      ignore_errors: yes
+      register: result
+
+    - assert:
+        that:
+          - "result.failed == true"
+          - "'host dummy_host' in result.failed_conditions"
+          - "'port dummy_port' in result.failed_conditions"
+  when: "'netdev' in show_lldp_neighbors_result.stdout"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_logging/tests/cli/basic.yaml ansible-2.4.2.0/test/integration/targets/ios_logging/tests/cli/basic.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_logging/tests/cli/basic.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_logging/tests/cli/basic.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,7 +6,6 @@
     name: 172.16.0.1
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: Remove console
   ios_logging:
@@ -14,7 +13,6 @@
     level: warnings
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: Remove buffer
   ios_logging:
@@ -22,16 +20,15 @@
     size: 8000
     authorize: yes
     state: absent
-    provider: "{{ cli }}"
 
 # start tests
 - name: Set up host logging
   ios_logging:
     dest: host
     name: 172.16.0.1
+    facility: local7
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -46,7 +43,6 @@
     name: 172.16.0.1
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -59,7 +55,6 @@
     name: 172.16.0.1
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -73,7 +68,6 @@
     name: 172.16.0.1
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -86,7 +80,6 @@
     level: warnings
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -99,7 +92,6 @@
     dest: buffered
     size: 8000
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -113,7 +105,6 @@
       - { dest: console, level: notifications }
       - { dest: buffered, size: 9000 }
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -129,7 +120,6 @@
       - { dest: buffered, size: 9000 }
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_ping/tests/cli/ping.yaml ansible-2.4.2.0/test/integration/targets/ios_ping/tests/cli/ping.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_ping/tests/cli/ping.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_ping/tests/cli/ping.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,22 +1,47 @@
 ---
 - debug: msg="START cli/ping.yaml"
 
+- ios_command:
+    commands: show version
+    authorize: yes
+  register: show_version_result
+
+- set_fact: management_interface=GigabitEthernet0/0
+  when: "'Cisco IOS' in show_version_result.stdout[0]"
+
+- set_fact: management_interface=GigabitEthernet1
+  when: "'Cisco IOS-XE' in show_version_result.stdout[0]"
+
+- name: Get show ip management interface output
+  ios_command:
+    commands:
+      - "show ip interface {{ management_interface }} | include Internet address"
+    authorize: yes
+  register: show_ip_interface_result
+
+- name: Extract the IP address from registered output
+  set_fact: management_ip="{{ show_ip_interface_result.stdout[0].split()[-1].split('/')[0] }}"
+
 - name: expected successful ping
   ios_ping: &valid_ip
-    dest: '8.8.8.8'
+    dest: '{{ management_ip }}'
+    authorize: yes
   register: esp
-  
+ 
 - name: unexpected unsuccessful ping
   ios_ping: &invalid_ip
     dest: '10.255.255.250'
     timeout: 45
+    authorize: yes
   register: uup
+  ignore_errors: yes
 
 - name: unexpected successful ping
   ios_ping:
     <<: *valid_ip
     state: 'absent'
   register: usp
+  ignore_errors: yes
 
 - name: expected unsuccessful ping
   ios_ping:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_static_route/tests/cli/basic.yaml ansible-2.4.2.0/test/integration/targets/ios_static_route/tests/cli/basic.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_static_route/tests/cli/basic.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_static_route/tests/cli/basic.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,7 +6,6 @@
     next_hop: 10.0.0.8
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -21,7 +20,6 @@
     next_hop: 10.0.0.8
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -36,7 +34,6 @@
     admin_distance: 2
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -52,7 +49,6 @@
     admin_distance: 2
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -67,7 +63,6 @@
     admin_distance: 2
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -83,7 +78,6 @@
     admin_distance: 2
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -97,7 +91,6 @@
       - { prefix: 172.16.33.0, mask: 255.255.255.0, next_hop: 10.0.0.8 }
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -113,7 +106,6 @@
       - { prefix: 172.16.34.0, mask: 255.255.255.0, next_hop: 10.0.0.8 }
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -129,7 +121,6 @@
       - { prefix: 172.16.34.0, mask: 255.255.255.0, next_hop: 10.0.0.8 }
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_domain_list.yaml ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_domain_list.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_domain_list.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_domain_list.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -8,14 +8,12 @@
       - no ip domain-list redhat.com
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: configure domain_search
   ios_system:
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -30,7 +28,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -42,7 +39,6 @@
   ios_system:
     domain_search:
       - ansible.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -55,7 +51,6 @@
   ios_system:
     domain_search:
       - ansible.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -68,7 +63,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -82,7 +76,6 @@
     domain_search:
       - ansible.com
       - redhat.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -95,7 +88,6 @@
     domain_search:
       - ansible.com
       - eng.ansible.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -111,7 +103,6 @@
     domain_search:
       - ansible.com
       - eng.ansible.com
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -127,6 +118,5 @@
       - no ip domain-list eng.ansible.com
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - debug: msg="END cli/set_domain_search.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_domain_name.yaml ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_domain_name.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_domain_name.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_domain_name.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,13 +6,11 @@
     lines: no ip domain-name
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: configure domain_name
   ios_system:
     domain_name: eng.ansible.com
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -23,7 +21,6 @@
   ios_system:
     domain_name: eng.ansible.com
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -35,6 +32,5 @@
     lines: no ip domain-name
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - debug: msg="END cli/set_domain_name.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_hostname.yaml ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_hostname.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_hostname.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_hostname.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -6,13 +6,11 @@
     lines: hostname switch
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: configure hostname
   ios_system:
     hostname: foo
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -23,7 +21,6 @@
   ios_system:
     hostname: foo
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -35,6 +32,5 @@
     lines: "hostname {{ inventory_hostname }}"
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - debug: msg="END cli/set_hostname.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_lookup_source.yaml ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_lookup_source.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_lookup_source.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_lookup_source.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -4,28 +4,25 @@
 - name: setup
   ios_config:
     lines:
-      - no ip domain lookup source-interface
+      - no ip domain lookup source-interface Loopback888
       - vrf definition ansible
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: configure lookup_source
   ios_system:
-    lookup_source: Loopback10
-    provider: "{{ cli }}"
+    lookup_source: Loopback888
     authorize: yes
   register: result
 
 - assert:
     that:
       - result.changed == true
-      - "'ip domain lookup source-interface Loopback10' in result.commands"
+      - "'ip domain lookup source-interface Loopback888' in result.commands"
 
 - name: verify lookup_source
   ios_system:
-    lookup_source: Loopback10
-    provider: "{{ cli }}"
+    lookup_source: Loopback888
     authorize: yes
   register: result
 
@@ -36,7 +33,6 @@
 - name: Disable lookup_source
   ios_system:
     lookup_enabled: False
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -48,7 +44,6 @@
 - name: Disable lookup_source
   ios_system:
     lookup_enabled: True
-    provider: "{{ cli }}"
     authorize: yes
   register: result
 
@@ -89,11 +84,10 @@
 - name: teardown
   ios_config:
     lines:
-      - no ip domain lookup source-interface
+      - no ip domain lookup source-interface Loopback888
       - no vrf definition ansible
     match: none
     authorize: yes
-    provider: "{{ cli }}"
   ignore_errors: yes
 # FIXME: Not sure why this is failing with msg": "no vrf definition ansible\r\n% IPv4 and IPv6 addresses from all interfaces in VRF ansible have been removed\r\nfoo(config)#", rc:1
 
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_name_servers.yaml ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_name_servers.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_system/tests/cli/set_name_servers.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_system/tests/cli/set_name_servers.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,7 +7,6 @@
       - no ip name-server
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - name: configure name_servers
   ios_system:
@@ -16,7 +15,6 @@
       - 2.2.2.2
       - 3.3.3.3
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -34,7 +32,6 @@
       - 2.2.2.2
       - 3.3.3.3
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -76,7 +73,6 @@
       - 1.1.1.1
       - 2.2.2.2
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -88,9 +84,8 @@
 - name: teardown
   ios_config:
     lines:
-      - no ip domain lookup source-interface
+      - no ip name-server
     match: none
     authorize: yes
-    provider: "{{ cli }}"
 
 - debug: msg="END cli/set_name_servers.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_user/tests/cli/auth.yaml ansible-2.4.2.0/test/integration/targets/ios_user/tests/cli/auth.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_user/tests/cli/auth.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_user/tests/cli/auth.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,18 +7,17 @@
       role: network-operator
       state: present
       authorize: yes
-      provider: "{{ cli }}"
       configured_password: pass123
 
   - name: test login
     expect:
-      command: "ssh auth_user@{{ ansible_ssh_host }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_ssh_port|default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAuthentication=no show version"
       responses:
         (?i)password: "pass123"
 
   - name: test login with invalid password (should fail)
     expect:
-      command: "ssh auth_user@{{ ansible_ssh_host }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_ssh_port|default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PubkeyAuthentication=no show version"
       responses:
         (?i)password: "badpass"
     ignore_errors: yes
@@ -34,6 +33,5 @@
     ios_user:
       name: auth_user
       state: absent
-      provider: "{{ cli }}"
       authorize: yes
     register: result
diff -Nru ansible-2.4.1.0/test/integration/targets/ios_user/tests/cli/basic.yaml ansible-2.4.2.0/test/integration/targets/ios_user/tests/cli/basic.yaml
--- ansible-2.4.1.0/test/integration/targets/ios_user/tests/cli/basic.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/ios_user/tests/cli/basic.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -7,7 +7,6 @@
       - name: ansibletest3
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - name: Create user (SetUp)
@@ -17,7 +16,6 @@
     role: network-operator
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -33,7 +31,6 @@
     authorize: yes
     state: present
     view: network-admin
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -48,7 +45,6 @@
     role: network-operator
     state: present
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -64,7 +60,6 @@
     authorize: yes
     state: present
     view: network-admin
-    provider: "{{ cli }}"
   register: result
 
 - assert:
@@ -80,7 +75,6 @@
       - name: ansibletest3
     state: absent
     authorize: yes
-    provider: "{{ cli }}"
   register: result
 
 - assert:
diff -Nru ansible-2.4.1.0/test/integration/targets/iosxr_interface/tests/cli/intent.yaml ansible-2.4.2.0/test/integration/targets/iosxr_interface/tests/cli/intent.yaml
--- ansible-2.4.1.0/test/integration/targets/iosxr_interface/tests/cli/intent.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/iosxr_interface/tests/cli/intent.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -3,15 +3,15 @@
 
 - name: Setup (interface is up)
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
-    description: test_interface_5
+    name: GigabitEthernet0/0/0/1
+    description: test_interface_1
     enabled: True
     state: present
   register: result
 
 - name: Check intent arguments
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     state: up
     delay: 20
   register: result
@@ -22,7 +22,7 @@
 
 - name: Check intent arguments (failed condition)
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     state: down
   ignore_errors: yes
   register: result
@@ -34,7 +34,7 @@
 
 - name: Config + intent
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     enabled: False
     state: down
     delay: 20
@@ -46,7 +46,7 @@
 
 - name: Config + intent (fail)
   iosxr_interface:
-    name: GigabitEthernet0/0/0/5
+    name: GigabitEthernet0/0/0/1
     enabled: False
     state: up
   ignore_errors: yes
@@ -60,7 +60,7 @@
 - name: Aggregate config + intent (pass)
   iosxr_interface:
     aggregate:
-    - name: GigabitEthernet0/0/0/5
+    - name: GigabitEthernet0/0/0/1
       enabled: True
       state: up
       delay: 20
diff -Nru ansible-2.4.1.0/test/integration/targets/iosxr_user/tests/cli/auth.yaml ansible-2.4.2.0/test/integration/targets/iosxr_user/tests/cli/auth.yaml
--- ansible-2.4.1.0/test/integration/targets/iosxr_user/tests/cli/auth.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/iosxr_user/tests/cli/auth.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -8,13 +8,13 @@
 
   - name: test login
     expect:
-      command: "ssh auth_user@{{ ansible_ssh_host }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_ssh_port }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
       responses:
         (?i)password: "pass123"
 
   - name: test login with invalid password (should fail)
     expect:
-      command: "ssh auth_user@{{ ansible_ssh_host }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
+      command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_ssh_port }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no show version"
       responses:
         (?i)password: "badpass"
     ignore_errors: yes
diff -Nru ansible-2.4.1.0/test/integration/targets/junos_netconf/tests/cli/changeport.yaml ansible-2.4.2.0/test/integration/targets/junos_netconf/tests/cli/changeport.yaml
--- ansible-2.4.1.0/test/integration/targets/junos_netconf/tests/cli/changeport.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/junos_netconf/tests/cli/changeport.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -12,7 +12,7 @@
 - name: Change port
   junos_netconf:
     state: present
-    netconf_port: 22
+    netconf_port: 8022
   register: result
 
 - assert:
@@ -22,23 +22,23 @@
 - name: idempotent tests
   junos_netconf:
     state: present
-    netconf_port: 22
+    netconf_port: 8022
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
-- name: wait for persistent socket to timeout, this ensures new socket creation with connection type netconf
-  pause:
-    seconds: 120
-
-- name: Ensure we can communicate over 22
+- name: Ensure we can communicate over 8022
   junos_command:
     rpcs:
     - get-software-information
     provider: "{{ netconf }}"
-    port: 22
+    port: 8022
+
+- name: wait for persistent socket to timeout
+  pause:
+    seconds: 120
 
 # This protects against the port override above not being honoured and a bug setting the port
 - name: Ensure we can NOT communicate over default port
@@ -51,17 +51,16 @@
 - assert:
     that:
       - "result.failed == true"
-      - "'unable to open shell' in result.msg"
-
-- name: wait for persistent socket to timeout, this ensures new socket creation with connection type netconf
-  pause:
-    seconds: 120
 
 - name: Set back netconf to default port
   junos_netconf:
     state: present
   register: result
 
+- name: wait for persistent socket to timeout
+  pause:
+    seconds: 120
+
 - name: Ensure we can communicate over netconf
   junos_command:
     rpcs:
diff -Nru ansible-2.4.1.0/test/integration/targets/junos_netconf/tests/cli/netconf.yaml ansible-2.4.2.0/test/integration/targets/junos_netconf/tests/cli/netconf.yaml
--- ansible-2.4.1.0/test/integration/targets/junos_netconf/tests/cli/netconf.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/junos_netconf/tests/cli/netconf.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -57,7 +57,6 @@
 - assert:
     that:
       - "result.failed == true"
-      - "'unable to open shell' in result.msg"
 
 - name: re-enable netconf
   junos_netconf:
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_acl/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_acl/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_acl/tests/common/sanity.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_acl/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,6 +1,9 @@
 ---
 - debug: msg="START TRANSPORT:{{ connection.transport }} nxos_acl sanity test"
 
+- set_fact: time_range="ans-range"
+  when: not (platform | match("N5K"))
+
 - name: "Setup: Cleanup possibly existing acl."
   nxos_acl: &remove
     name: TEST_ACL
@@ -17,8 +20,8 @@
     proto: tcp
     src: 1.1.1.1/24
     src_port_op: range
-    src_port1: 5
-    src_port2: 20
+    src_port1: 1900
+    src_port2: 1910
     ack: 'enable'
     dscp: 'af43'
     dest: any
@@ -29,7 +32,7 @@
     fin: 'enable'
     rst: 'enable'
     syn: 'enable'
-    time_range: 'ans-range'
+    time_range: "{{time_range|default(omit)}}"
     state: present
     provider: "{{ connection }}"
   register: result
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_bgp/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_bgp/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_bgp/tests/common/sanity.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_bgp/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -2,10 +2,10 @@
 - debug: msg="START TRANSPORT:{{ connection.transport }} nxos_bgp sanity test"
 
 - set_fact: neighbor_down_fib_accelerate="true"
-  when: (titanium is defined) and not ((titanium | search('true')))
+  when: not titanium
 
 - set_fact: reconnect_interval="55"
-  when: (titanium is defined) and not ((titanium | search('true')))
+  when: not titanium
 
 - name: "Enable feature BGP"
   nxos_feature:
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_bgp_neighbor/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_bgp_neighbor/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_bgp_neighbor/tests/common/sanity.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_bgp_neighbor/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -4,10 +4,10 @@
 - set_fact: intname="{{ nxos_int1 }}"
 
 - set_fact: log_neighbor_changes="enable"
-  when: (titanium is defined) and not ((titanium | search('true')))
+  when: not titanium
 
 - set_fact: remove_private_as="all"
-  when: (titanium is defined) and not ((titanium | search('true')))
+  when: not titanium
 
 - name: "Enable feature BGP"
   nxos_feature:
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ cli }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,38 @@
+---
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,84 @@
+---
+- debug: msg="START TRANSPORT:CLI nxos_file_copy sanity test"
+
+- name: "Setup - Remove existing file"
+  nxos_command: &remove_file
+    commands:
+      - terminal dont-ask
+      - delete nxos.yaml
+    provider: "{{ cli }}"
+  ignore_errors: yes
+
+- name: "Setup - Turn on feature scp-server"
+  nxos_feature: 
+    feature: scp-server
+    state: enabled
+    provider: "{{ cli }}"
+
+- block:
+  - name: "Copy nxos.yaml to bootflash"
+    nxos_file_copy: &copy_file_same_name
+      local_file: "./nxos.yaml"
+      file_system: "bootflash:"
+      provider: "{{ cli }}"
+      username: "{{ ansible_ssh_user }}"
+      password: "{{ ansible_ssh_pass }}"
+      host: "{{ ansible_host }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Check Idempotence - Copy nxos.yaml to bootflash"
+    nxos_file_copy: *copy_file_same_name
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: "Setup - Remove existing file"
+    nxos_command: *remove_file
+    register: result
+
+  - name: "Copy ios.yaml to bootflash as another name"
+    nxos_file_copy: &copy_file_different_name
+      local_file: "./ios.yaml"
+      remote_file: "nxos.yaml"
+      file_system: "bootflash:"
+      provider: "{{ cli }}"
+      username: "{{ ansible_ssh_user }}"
+      password: "{{ ansible_ssh_pass }}"
+      host: "{{ ansible_host }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence - Copy ios.yaml to bootflash as another name"
+    nxos_file_copy: *copy_file_different_name
+    register: result
+
+  - assert: *false
+
+  - name: "Setup - Remove existing file"
+    nxos_command: *remove_file
+    register: result
+
+  rescue:
+
+  - debug: msg="TRANSPORT:CLI nxos_file_copy failure detected"
+
+  always:
+
+  - name: "Remove file"
+    nxos_command: *remove_file
+    ignore_errors: yes
+
+  - name: "Turn off feature scp-server"
+    nxos_feature:
+      feature: scp-server
+      state: disabled
+      provider: "{{ cli }}"
+
+  - debug: msg="END TRANSPORT:CLI nxos_file_copy sanity test"  
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_file_copy/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_file_copy/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,88 @@
+---
+- debug: msg="START TRANSPORT:NXAPI nxos_file_copy sanity test"
+
+- name: "Setup - Remove existing file"
+  nxos_command: &remove_file
+    commands:
+      - command: terminal dont-ask
+        output: text
+      - command: delete nxos.yaml
+        output: text
+    provider: "{{ nxapi }}"
+  ignore_errors: yes
+
+- name: "Setup - Turn on feature scp-server"
+  nxos_feature: 
+    feature: scp-server
+    state: enabled
+    provider: "{{ nxapi }}"
+
+- block:
+  - name: "Copy nxos.yaml to bootflash"
+    nxos_file_copy: &copy_file_same_name
+      local_file: "./nxos.yaml"
+      file_system: "bootflash:"
+      provider: "{{ nxapi }}"
+      username: "{{ ansible_ssh_user }}"
+      password: "{{ ansible_ssh_pass }}"
+      host: "{{ ansible_host }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Check Idempotence - Copy nxos.yaml to bootflash"
+    nxos_file_copy: *copy_file_same_name
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: "Setup - Remove existing file"
+    nxos_command: *remove_file
+    register: result
+    ignore_errors: yes
+
+  - name: "Copy ios.yaml to bootflash as another name"
+    nxos_file_copy: &copy_file_different_name
+      local_file: "./ios.yaml"
+      remote_file: "nxos.yaml"
+      file_system: "bootflash:"
+      provider: "{{ nxapi }}"
+      username: "{{ ansible_ssh_user }}"
+      password: "{{ ansible_ssh_pass }}"
+      host: "{{ ansible_host }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence - Copy ios.yaml to bootflash as another name"
+    nxos_file_copy: *copy_file_different_name
+    register: result
+
+  - assert: *false
+
+  - name: "Setup - Remove existing file"
+    nxos_command: *remove_file
+    register: result
+    ignore_errors: yes
+
+  rescue:
+
+  - debug: msg="TRANSPORT:NXAPI nxos_file_copy failure detected"
+
+  always:
+
+  - name: "Remove file"
+    nxos_command: *remove_file
+    ignore_errors: yes
+
+  - name: "Turn off feature scp-server"
+    nxos_feature:
+      feature: scp-server
+      state: disabled
+      provider: "{{ nxapi }}"
+
+  - debug: msg="END TRANSPORT:NXAPI nxos_file_copy sanity test"  
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_hsrp/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,92 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_hsrp sanity test"
+
+# Select interface for test
+- set_fact: intname="{{ nxos_int1 }}"
+
+- block:
+  - name: "Enable feature hsrp"
+    nxos_feature: 
+      feature: hsrp
+      state: enabled
+      provider: "{{ connection }}"
+
+  - name: "change interface mode"
+    nxos_config:
+      commands:
+        - no switchport
+      parents:
+        - "interface {{ intname }}"
+      match: none
+      provider: "{{ connection }}"
+
+  - name: "configure nxos_hsrp"
+    nxos_hsrp: &configure
+      group: 10
+      version: 2
+      vip: 10.1.1.1
+      priority: 150
+      interface: "{{ intname }}"
+      preempt: enabled
+      auth_type: text
+      auth_string: CISCO
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Conf Idempotence"
+    nxos_hsrp: *configure
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: "remove nxos_hsrp"
+    nxos_hsrp: &remove
+      group: 10
+      version: 2
+      vip: 10.1.1.1
+      priority: 150
+      interface: "{{ intname }}"
+      preempt: enabled
+      auth_type: text
+      auth_string: CISCO
+      provider: "{{ connection }}"
+      state: absent
+    register: result
+
+  - assert: *true
+
+  - name: "Remove Idempotence"
+    nxos_hsrp: *remove
+    register: result
+
+  - assert: *false
+
+  always:
+  - name: "remove nxos_hsrp"
+    nxos_hsrp:
+      group: 10
+      version: 2
+      vip: 10.1.1.1
+      priority: 150
+      interface: "{{ intname }}"
+      preempt: enabled
+      auth_type: text
+      auth_string: CISCO
+      provider: "{{ connection }}"
+      state: absent
+    ignore_errors: yes
+
+  - name: "Disable feature hsrp"
+    nxos_feature: 
+      feature: hsrp
+      state: disabled
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_hsrp sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_hsrp/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp/tasks/cli.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,15 +1,25 @@
 ---
-- name: collect all cli test cases
+- name: collect common cli test cases
   find:
-    paths: "{{ role_path }}/tests/cli"
+    paths: "{{ role_path }}/tests/common"
     patterns: "{{ testcase }}.yaml"
   register: test_cases
 
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
 - name: set test_items
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
 
 - name: run test case
-  include: "{{ test_case_to_run }}"
+  include: "{{ test_case_to_run }} connection={{ cli }}"
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp/tasks/main.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,7 +1,3 @@
 ---
-# Use block to ensure that both cli and nxapi tests
-# will run even if there are failures or errors.
-- block:
-  - { include: cli.yaml, tags: ['cli'] }
-  always:
-  - { include: nxapi.yaml, tags: ['nxapi'] }
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp/tasks/nxapi.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -1,10 +1,20 @@
 ---
-- name: collect all nxapi test cases
+- name: collect common nxapi test cases
   find:
-    paths: "{{ role_path }}/tests/nxapi"
+    paths: "{{ role_path }}/tests/common"
     patterns: "{{ testcase }}.yaml"
   register: test_cases
 
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
 - name: set test_items
   set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
 
@@ -16,7 +26,7 @@
     provider: "{{ cli }}"
 
 - name: run test case
-  include: "{{ test_case_to_run }}"
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp/tests/cli/sanity.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ cli }}"
-
-- import_tasks: targets/nxos_igmp/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp/tests/nxapi/sanity.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
----
-- set_fact: connection="{{ nxapi }}"
-
-- import_tasks: targets/nxos_igmp/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ cli }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,38 @@
+---
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_interface/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_interface/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,90 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_igmp_interface sanity test"
+
+# Select interface for test
+- set_fact: intname="{{ nxos_int1 }}"
+
+- name: "Enable feature PIM"
+  nxos_feature:
+    feature: pim
+    state: enabled
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+  
+  - name: put interface in L3 and enable PIM
+    nxos_config:
+      commands:
+        - no switchport
+        - ip pim sparse-mode
+      parents:
+        - "interface {{ intname }}"
+      match: none
+      provider: "{{ connection }}"
+
+  - name: Configure igmp interface with non-default values
+    nxos_igmp_interface: &non-default
+      interface: "{{ intname }}"
+      version: 3
+      startup_query_interval: 60
+      startup_query_count: 5
+      robustness: 6
+      querier_timeout: 2000
+      query_mrt: 12
+      query_interval: 200
+      last_member_qrt: 2
+      last_member_query_count: 4
+      report_llg: true
+      immediate_leave: true
+      restart: false
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Check Idempotence - Configure igmp interface with non-default values"
+    nxos_igmp_interface: *non-default
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: Configure igmp interface with default value
+    nxos_igmp_interface: &default
+      interface: "{{ intname }}"
+      state: default
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence - Configure igmp interface with default value"
+    nxos_igmp_interface: *default
+    register: result
+
+  - assert: *false
+
+  always:
+  - name: Configure igmp interface with default value
+    nxos_igmp_interface: *default
+    register: result
+
+  - name: Put interface in default mode
+    nxos_config:
+      commands:
+      - "default interface {{ intname }}"
+      provider: "{{ connection }}"
+      match: none
+
+  - name: "Disable feature PIM"
+    nxos_feature:
+      feature: pim
+      state: disabled
+      provider: "{{ connection }}"
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_igmp_interface sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ cli }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,38 @@
+---
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_igmp_snooping/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,48 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_igmp_snooping sanity test"
+
+- block:
+
+  - name: Configure igmp snooping with non-default values
+    nxos_igmp_snooping: &non-default
+      snooping: true
+      group_timeout: never
+      link_local_grp_supp: true
+      report_supp: true
+      v3_report_supp: true
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Check Idempotence - Configure igmp snooping with non-default values"
+    nxos_igmp_snooping: *non-default
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: Configure igmp snooping with default values
+    nxos_igmp_snooping: &default
+      state: default
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence - Configure igmp snooping with default values"
+    nxos_igmp_snooping: *default
+    register: result
+
+  - assert: *false
+
+  always:
+  - name: Configure igmp snooping with default values
+    nxos_igmp_snooping: *default
+    register: result
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_igmp_snooping sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ cli }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,38 @@
+---
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_auth/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_auth/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,87 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_ntp_auth sanity test"
+
+- name: Configure text ntp authentication
+  nxos_ntp_auth: &setup
+    key_id: 32
+    md5string: hello
+    state: absent
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+
+  - name: Configure text ntp authentication
+    nxos_ntp_auth: &configure_text
+      key_id: 32
+      md5string: hello
+      auth_type: text
+      trusted_key: true
+      authentication: on
+      state: present
+      provider: "{{ connection }}"      
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Check Idempotence - Configure text ntp authentication"
+    nxos_ntp_auth: *configure_text
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: Remove text ntp authentication
+    nxos_ntp_auth: &remove_text
+      key_id: 32
+      md5string: hello
+      auth_type: text
+      trusted_key: true
+      authentication: on
+      state: absent
+      provider: "{{ connection }}"      
+    register: result
+
+  - assert: *true
+
+  - name: Configure encrypt ntp authentication
+    nxos_ntp_auth: &configure_encrypt
+      key_id: 32
+      md5string: hello
+      auth_type: encrypt
+      trusted_key: true
+      authentication: on
+      state: present
+      provider: "{{ connection }}"      
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence - Configure encrypt ntp authentication"
+    nxos_ntp_auth: *configure_encrypt
+    register: result
+
+  - assert: *false
+
+  - name: Remove encrypt ntp authentication
+    nxos_ntp_auth: &remove_encrypt
+      key_id: 32
+      md5string: hello
+      auth_type: encrypt
+      trusted_key: true
+      authentication: on
+      state: absent
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  always:
+  - name: Cleanup ntp auth config
+    nxos_ntp_auth: *setup
+    ignore_errors: yes
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_ntp_auth sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ cli }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,38 @@
+---
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_ntp_options/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_ntp_options/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,74 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_ntp_options sanity test"
+
+- name: "Apply default ntp config" 
+  nxos_ntp_options: &default
+    state: absent
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+
+  - name: Configure ntp with master and default stratum
+    nxos_ntp_options: &configure_master_default_stratum
+      master: true
+      logging: true
+      state: present
+      provider: "{{ connection }}"      
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Check Idempotence - Configure ntp with master and default stratum"
+    nxos_ntp_options: *configure_master_default_stratum
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: Remove ntp with master and default stratum
+    nxos_ntp_options: &remove_master_default_stratum
+      logging: true
+      master: true
+      state: absent
+      provider: "{{ connection }}"      
+    register: result
+
+  - assert: *true
+
+  - name: Configure ntp with master and non-default stratum
+    nxos_ntp_options: &configure_master_non_default_stratum
+      master: true
+      logging: true
+      stratum: 10
+      state: present
+      provider: "{{ connection }}"      
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence - Configure ntp with master and non-default stratum"
+    nxos_ntp_options: *configure_master_non_default_stratum
+    register: result
+
+  - assert: *false
+
+  - name: Remove ntp with master and non-default stratum
+    nxos_ntp_options: &remove_master_non_default_stratum
+      logging: true
+      master: true
+      state: absent
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  always:
+  - name: Cleanup ntp config
+    nxos_ntp_options: *default
+    register: result
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_ntp_options sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
+- { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_snapshot/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,46 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_snapshot sanity test"
+
+- set_fact: snapshot_run="true"
+- set_fact: snapshot_run="false"
+  when: titanium and (connection.transport | match('nxapi'))
+
+- block:
+  - name: create snapshot
+    nxos_snapshot:
+      action: create
+      snapshot_name: test_snapshot1
+      description: Ansible
+      provider: "{{ connection }}"
+
+  - name: create another snapshot
+    nxos_snapshot:
+      action: create
+      snapshot_name: test_snapshot2
+      description: row
+      section: myshow
+      show_command: show ip interface brief
+      row_id: ROW_intf
+      element_key1: intf-name
+      provider: "{{ connection }}"
+
+  - name: compare snapshots
+    nxos_snapshot:
+      action: compare
+      snapshot1: test_snapshot1
+      snapshot2: test_snapshot2
+      comparison_results_file: compare_snapshots.txt
+      compare_option: summary
+      path: '.'
+      provider: "{{ connection }}"
+
+  when: snapshot_run
+
+  always:
+  - name: delete snapshot
+    nxos_snapshot:
+      action: delete_all
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_snapshot sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_snapshot/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common cli test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: cli_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ cli_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ cli }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,25 @@
+---
+- name: collect common nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/common"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: collect nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: nxapi_cases
+
+- set_fact:
+    test_cases:
+      files: "{{ test_cases.files }} + {{ nxapi_cases.files }}"
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }} connection={{ nxapi }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v2_trap.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v2_trap.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v2_trap.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v2_trap.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,64 @@
+---
+- set_fact: snmp_type="trap"
+- set_fact: snmp_version="v2c"
+
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_snmp_host {{ snmp_type }} {{ snmp_version }}sanity test"
+
+# Select interface for test
+- set_fact: intname="{{ nxos_int1 }}"
+  when: not (platform | match("N5K"))
+
+- name: Setup - Remove snmp_host if configured
+  nxos_snmp_host: &remove
+    snmp_host: 3.3.3.3
+    community: TESTING
+    version: "{{ snmp_version }}" 
+    snmp_type: "{{ snmp_type }}" 
+    vrf: management
+    vrf_filter: management
+    src_intf: "{{ intname|default(omit) }}"
+    state: absent 
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+
+  - name: Configure snmp host 
+    nxos_snmp_host: &config
+      snmp_host: 3.3.3.3
+      community: TESTING
+      version: "{{ snmp_version }}" 
+      snmp_type: "{{ snmp_type }}" 
+      vrf: management
+      vrf_filter: management
+      src_intf: "{{ intname|default(omit) }}"
+      state: present 
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: Idempotence Check
+    nxos_snmp_host: *config
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  always:
+  - name: Cleanup
+    nxos_snmp_host: *remove
+    register: result
+
+  - assert: *true
+
+  - name: Cleanup Idempotence
+    nxos_snmp_host: *remove
+    register: result
+
+  - assert: *false
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_snmp_host {{ snmp_type }} {{ snmp_version }}sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_inform.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_inform.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_inform.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_inform.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,69 @@
+---
+- set_fact: snmp_type="inform"
+- set_fact: snmp_version="v3"
+- set_fact: snmp_auth="noauth"
+
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_snmp_host {{ snmp_type }} {{ snmp_version }}sanity test"
+
+# Select interface for test
+- set_fact: intname="{{ nxos_int1 }}"
+  when: not (platform | match("N5K"))
+
+- name: Setup - Remove snmp_host if configured
+  nxos_snmp_host: &remove
+    snmp_host: 3.3.3.3
+    community: TESTING
+    v3: "{{ snmp_auth|default(omit) }}"
+    version: "{{ snmp_version }}" 
+    snmp_type: "{{ snmp_type }}" 
+    vrf: management
+    vrf_filter: management
+    src_intf: "{{ intname|default(omit) }}"
+    state: absent 
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+
+  - name: Configure snmp host 
+    nxos_snmp_host: &config
+      snmp_host: 3.3.3.3
+      community: TESTING
+      v3: "{{ snmp_auth|default(omit) }}"
+      version: "{{ snmp_version }}" 
+      snmp_type: "{{ snmp_type }}" 
+      vrf: management
+      vrf_filter: management
+      src_intf: "{{ intname|default(omit) }}"
+      state: present 
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: Idempotence Check
+    nxos_snmp_host: *config
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  when: not (platform | match('N35'))
+
+  always:
+  - name: Cleanup
+    nxos_snmp_host: *remove
+    register: result
+
+  - assert: *true
+
+  - name: Cleanup Idempotence
+    nxos_snmp_host: *remove
+    register: result
+
+  - assert: *false
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_snmp_host {{ snmp_type }} {{ snmp_version }}sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_trap.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_trap.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_trap.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_host/tests/common/sanity_snmp_v3_trap.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,61 @@
+---
+- set_fact: snmp_type="trap"
+- set_fact: snmp_version="v3"
+- set_fact: snmp_auth="noauth"
+
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_snmp_host {{ snmp_type }} {{ snmp_version }}sanity test"
+
+- name: Setup - Remove snmp_host if configured
+  nxos_snmp_host: &remove
+    snmp_host: 3.3.3.3
+    community: TESTING
+    v3: "{{ snmp_auth|default(omit) }}"
+    version: "{{ snmp_version }}" 
+    snmp_type: "{{ snmp_type }}" 
+    vrf: management
+    vrf_filter: management
+    state: absent 
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+
+  - name: Configure snmp host 
+    nxos_snmp_host: &config
+      snmp_host: 3.3.3.3
+      community: TESTING
+      v3: "{{ snmp_auth|default(omit) }}"
+      version: "{{ snmp_version }}" 
+      snmp_type: "{{ snmp_type }}" 
+      vrf: management
+      vrf_filter: management
+      state: present 
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: Idempotence Check
+    nxos_snmp_host: *config
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  always:
+  - name: Cleanup
+    nxos_snmp_host: *remove
+    register: result
+
+  - assert: *true
+
+  - name: Cleanup Idempotence
+    nxos_snmp_host: *remove
+    register: result
+
+  - assert: *false
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_snmp_host {{ snmp_type }} {{ snmp_version }}sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,47 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_snmp_location sanity test"
+
+- name: Setup - Remove snmp_location if configured
+  nxos_snmp_location: &remove
+    location: Test
+    state: absent
+    timeout: 60
+    provider: "{{ connection }}"
+  ignore_errors: yes
+
+- block:
+
+  - name: Configure snmp host
+    nxos_snmp_location: &config
+      location: Test
+      state: present
+      timeout: 60
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: Idempotence Check
+    nxos_snmp_location: *config
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  always:
+  - name: Cleanup
+    nxos_snmp_location: *remove
+    register: result
+
+  - assert: *true
+
+  - name: Cleanup Idempotence
+    nxos_snmp_location: *remove
+    register: result
+
+  - assert: *false
+
+  - debug: msg="END TRANSPORT:{{ connection.transport }} nxos_snmp_location sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: "{{ role_path }}/tests/common/sanity.yaml"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_snmp_user/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,41 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_snmp_user sanity test"
+
+- name: Create snmp user
+  nxos_snmp_user: &create
+    user: ntc
+    group: network-operator
+    authentication: md5
+    pwd: N$tOpe%1
+    privacy: HelloU$er1
+    encrypt: true
+    provider: "{{ connection }}"
+  register: result
+
+- assert: &true
+    that:
+      - "result.changed == true"
+
+- name: delete snmp user
+  nxos_snmp_user: &remove
+    user: ntc
+    group: network-operator
+    authentication: md5
+    pwd: Testing1%
+    privacy: HelloU$er1
+    encrypt: true
+    state: absent
+    provider: "{{ connection }}"
+  register: result
+
+- assert: *true
+
+- name: "Remove Idempotence"
+  nxos_snmp_user: *remove
+  register: result
+
+- assert: &false
+    that:
+      - "result.changed == false"
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_snmp_user sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_snmp_user/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_static_route/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_static_route/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,61 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_static_route sanity test"
+
+- block:
+  - name: create static route
+    nxos_static_route: &configure
+      prefix: "192.168.20.64/24"
+      next_hop: "3.3.3.3"
+      route_name: testing
+      pref: 100
+      tag: 5500
+      vrf: testing
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Conf Idempotence"
+    nxos_static_route: *configure
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: remove static route
+    nxos_static_route: &remove
+      prefix: "192.168.20.64/24"
+      next_hop: "3.3.3.3"
+      route_name: testing
+      pref: 100
+      tag: 5500
+      vrf: testing
+      state: absent
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Remove Idempotence"
+    nxos_static_route: *remove
+    register: result
+
+  - assert: *false
+
+  always:
+  - name: remove static route
+    nxos_static_route:
+      prefix: "192.168.20.64/24"
+      next_hop: "3.3.3.3"
+      route_name: testing
+      pref: 100
+      tag: 5500
+      vrf: testing
+      state: absent
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_static_route sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_static_route/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_udld/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_udld/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,67 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_udld sanity test"
+
+- set_fact: udld_run="true"
+- set_fact: udld_run="false"
+  when: ((platform | search('N9K-F')) and (imagetag and (imagetag | version_compare('F3', 'lt'))))
+- set_fact: udld_run="false"
+  when: titanium
+
+- block:
+  - name: "Enable feature udld"
+    nxos_feature: 
+      feature: udld
+      state: enabled
+      provider: "{{ connection }}"
+
+  - name: Reset udld
+    nxos_udld:
+      reset: True
+      provider: "{{ connection }}"
+
+  - name: Ensure udld agg mode is globally disabled and msg time is 20
+    nxos_udld: &conf1
+      aggressive: disabled
+      msg_time: 20
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Conf1 Idempotence"
+    nxos_udld: *conf1
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+
+  - name: Ensure udld agg mode is globally enabled and msg time is 15
+    nxos_udld: &conf2
+      aggressive: enabled
+      msg_time: 15
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "conf2 Idempotence"
+    nxos_udld: *conf2
+    register: result
+
+  - assert: *false
+
+  when: udld_run
+
+  always:
+  - name: "Disable udld"
+    nxos_feature: 
+      feature: udld
+      state: disabled
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_udld sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_udld/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_udld_interface/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,74 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_udld_interface sanity test"
+
+- set_fact: udld_run="true"
+- set_fact: udld_run="false"
+  when: ((platform | search('N9K-F')) and (imagetag and (imagetag | version_compare('F3', 'lt'))))
+- set_fact: udld_run="false"
+  when: titanium
+
+# Select interface for test
+- set_fact: intname="{{ nxos_int1 }}"
+
+- block:
+  - name: "Enable feature udld"
+    nxos_feature: 
+      feature: udld
+      state: enabled
+      provider: "{{ connection }}"
+
+  - name: "put the interface into default state"
+    nxos_config: 
+      commands:
+        - "default interface {{intname}}"
+      provider: "{{ connection }}"
+      match: none
+
+  - name: ensure interface is configured to be in aggressive mode
+    nxos_udld_interface: &conf1
+      interface: "{{ intname }}"
+      mode: aggressive
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Conf1 Idempotence"
+    nxos_udld_interface: *conf1
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: ensure interface has mode enabled
+    nxos_udld_interface: &conf2
+      interface: "{{ intname }}"
+      mode: enabled
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: Remove the config
+    nxos_udld_interface: &remove
+      interface: "{{ intname }}"
+      mode: enabled
+      state: absent
+      provider: "{{ connection }}"
+
+  when: udld_run
+
+  always:
+  - name: "Disable udld"
+    nxos_feature: 
+      feature: udld
+      state: disabled
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_udld_interface sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_udld_interface/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/cleanup.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/cleanup.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/cleanup.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/cleanup.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,24 @@
+---
+- name: "Unconfigure VDC setting limit-resource module-type f3"
+  nxos_config:
+    commands:
+      - 'terminal dont-ask ; vdc {{ vdcid }} ;  no limit-resource module-type f3'
+    match: none
+    provider: "{{ cli }}"
+  ignore_errors: yes
+
+- name: Previous command is asynchronous and can take a while.  Allow time for it to complete
+  pause:
+    seconds: 45
+
+- name: "Configure VDC setting allocate interface unallocated-interfaces"
+  nxos_config: &allocate
+    commands:
+      - 'terminal dont-ask ; vdc {{ vdcid }} ; allocate interface unallocated-interfaces'
+    match: none
+    provider: "{{ cli }}"
+  ignore_errors: yes
+
+- name: Previous command is asynchronous can take a while.  Allow time for it to complete
+  pause:
+    seconds: 45
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/setup.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/setup.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/setup.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep/tasks/platform/n7k/setup.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,32 @@
+---
+- name: "Get default vdc id"
+  nxos_command:
+    commands: ['show vdc current-vdc | json']
+    provider: "{{ cli }}"
+  register: vdcout
+
+- set_fact: vdcid="{{ vdcout.stdout_lines[0].name }}"
+
+- name: "Configure VDC setting limit-resource module-type f3"
+  nxos_config:
+    commands:
+      - "terminal dont-ask ; vdc {{ vdcid }} ;  limit-resource module-type f3"
+    match: none
+    provider: "{{ cli }}"
+  ignore_errors: yes
+
+- name: Previous command is asynchronous and can take a while.  Allow time for it to complete
+  pause:
+    seconds: 45
+
+- name: "Configure VDC setting allocate interface unallocated-interfaces"
+  nxos_config: &allocate
+    commands:
+      - "terminal dont-ask ; vdc {{ vdcid }} ; allocate interface unallocated-interfaces"
+    match: none
+    provider: "{{ cli }}"
+  ignore_errors: yes
+
+- name: Previous command is asynchronous and can take a while.  Allow time for it to complete
+  pause:
+    seconds: 45
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -2,6 +2,10 @@
 - - debug: msg="START TRANSPORT:{{ connection.transport }} nxos_vxlan_vtep sanity test"
 
 - block:
+  - name: "Apply N7K specific setup config"
+    include: targets/nxos_vxlan_vtep/tasks/platform/n7k/setup.yaml
+    when: platform | match('N7K')
+
   - name: "Enable feature nv overlay"
     nxos_config: 
       commands:
@@ -9,28 +13,56 @@
       provider: "{{ connection }}"
       match: none
 
-  - name: configure vxlan_vtep
-    nxos_vxlan_vtep: &configure
-      interface: nve1
-      description: default
-      host_reachability: true
-      source_interface: Loopback0
-      source_interface_hold_down_time: 30
-      shutdown: true
-      provider: "{{ connection }}"
-    register: result
+  - block:
+    - name: configure vxlan_vtep
+      nxos_vxlan_vtep: &configure9
+        interface: nve1
+        description: default
+        host_reachability: true
+        source_interface: Loopback0
+        source_interface_hold_down_time: 30
+        shutdown: true
+        provider: "{{ connection }}"
+      register: result
+  
+    - assert: &true
+        that:
+          - "result.changed == true"
+  
+    - name: "Conf Idempotence"
+      nxos_vxlan_vtep: *configure9
+      register: result
+
+    - assert: &false
+        that:
+          - "result.changed == false"
+
+    when: (platform | search('N9K'))
+
+  - block:
+    - name: configure vxlan_vtep
+      nxos_vxlan_vtep: &configure7
+        interface: nve1
+        description: default
+        host_reachability: true
+        source_interface: Loopback0
+        shutdown: true
+        provider: "{{ connection }}"
+      register: result
+  
+    - assert:
+        that:
+          - "result.changed == true"
+  
+    - name: "Conf Idempotence"
+      nxos_vxlan_vtep: *configure7
+      register: result
+
+    - assert:
+        that:
+          - "result.changed == false"
 
-  - assert: &true
-      that:
-        - "result.changed == true"
-
-  - name: "Conf Idempotence"
-    nxos_vxlan_vtep: *configure
-    register: result
-
-  - assert: &false
-      that:
-        - "result.changed == false"
+    when: (platform | search('N7K'))
 
   - name: remove vxlan_vtep
     nxos_vxlan_vtep: &remove
@@ -44,17 +76,25 @@
       provider: "{{ connection }}"
     register: result
 
-  - assert: *true
+  - assert:
+      that:
+        - "result.changed == true"
 
   - name: "Remove Idempotence"
     nxos_vxlan_vtep: *remove
     register: result
 
-  - assert: *false
+  - assert:
+      that:
+        - "result.changed == false"
 
-  when: (platform | search('N9K'))
+  when: (platform | search("N7K|N9K"))
 
   always:
+  - name: "Apply N7K specific cleanup config"
+    include: targets/nxos_vxlan_vtep/tasks/platform/n7k/cleanup.yaml
+    when: platform | match('N7K')
+
   - name: "Disable feature nv overlay"
     nxos_feature: 
       feature: nve
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/defaults/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/defaults/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/defaults/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/defaults/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+testcase: "*"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/meta/main.yml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/meta/main.yml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/meta/main.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/meta/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_nxos_tests
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/cli.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/cli.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/cli.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/cli.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,15 @@
+---
+- name: collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/main.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/main.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/main.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/main.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+# Use block to ensure that both cli and nxapi tests
+# will run even if there are failures or errors.
+- block:
+  - { include: cli.yaml, tags: ['cli'] }
+  always:
+  - { include: nxapi.yaml, tags: ['nxapi'] }
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/nxapi.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/nxapi.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/nxapi.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tasks/nxapi.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,28 @@
+---
+- name: collect all nxapi test cases
+  find:
+    paths: "{{ role_path }}/tests/nxapi"
+    patterns: "{{ testcase }}.yaml"
+  register: test_cases
+
+- name: set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: enable nxapi
+  nxos_config:
+    lines:
+      - feature nxapi
+      - nxapi http port 80
+    provider: "{{ cli }}"
+
+- name: run test case
+  include: "{{ test_case_to_run }}"
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ cli }}"
+
+- import_tasks: targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,137 @@
+---
+- debug: msg="START TRANSPORT:{{ connection.transport }} nxos_vxlan_vtep_vni sanity test"
+
+- block:
+  - name: "Apply N7K specific setup config"
+    include: targets/nxos_vxlan_vtep/tasks/platform/n7k/setup.yaml
+    when: platform | match('N7K')
+
+  - name: "Enable feature nv overlay"
+    nxos_config: 
+      commands:
+        - feature nv overlay
+      provider: "{{ connection }}"
+      match: none
+
+  - name: configure vxlan_vtep
+    nxos_vxlan_vtep:
+      interface: nve1
+      host_reachability: True
+      provider: "{{ connection }}"
+
+  - name: configure vxlan_vtep_vni assoc-vrf
+    nxos_vxlan_vtep_vni: &conf1
+      interface: nve1
+      vni: 6000
+      assoc_vrf: True
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: &true
+      that:
+        - "result.changed == true"
+
+  - name: "Conf 1 Idempotence"
+    nxos_vxlan_vtep_vni: *conf1
+    register: result
+
+  - assert: &false
+      that:
+        - "result.changed == false"
+
+  - name: remove vxlan_vtep_vni
+    nxos_vxlan_vtep_vni:
+      interface: nve1
+      vni: 6000
+      assoc_vrf: True
+      state: absent
+      provider: "{{ connection }}"
+
+  - name: configure vxlan_vtep_vni mcast
+    nxos_vxlan_vtep_vni: &conf2
+      interface: nve1
+      vni: 8000
+      multicast_group: 224.1.1.1
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Conf 2 Idempotence"
+    nxos_vxlan_vtep_vni: *conf2
+    register: result
+
+  - assert: *false
+
+  - name: "remove config"
+    nxos_vxlan_vtep_vni: &remove
+      interface: nve1
+      vni: 8000
+      state: absent
+      provider: "{{ connection }}"
+
+  - name: configure vxlan_vtep
+    nxos_vxlan_vtep:
+      interface: nve1
+      host_reachability: False
+      provider: "{{ connection }}"
+
+  - block:
+    - name: configure vxlan_vtep_vni peer-list
+      nxos_vxlan_vtep_vni: &conf3
+        interface: nve1
+        vni: 8000
+        peer_list: 
+          - 1.1.1.1
+          - 2.2.2.2
+          - 3.3.3.3
+          - 4.4.4.4
+        ingress_replication: static
+        provider: "{{ connection }}"
+      register: result
+  
+    - assert: *true
+
+    - name: "Conf 3 Idempotence"
+      nxos_vxlan_vtep_vni: *conf3
+      register: result
+  
+    - assert: *false
+
+    - name: remove vxlan_vtep_vni
+      nxos_vxlan_vtep_vni: *remove
+      register: result
+
+    - assert: *true
+
+    - name: "remove Idempotence"
+      nxos_vxlan_vtep_vni: *remove
+      register: result
+
+    - assert: *false
+
+    when: (platform | search('N9K'))
+
+  when: (platform | search("N7K|N9K"))
+
+  always:
+  - name: "Apply N7K specific cleanup config"
+    include: targets/nxos_vxlan_vtep/tasks/platform/n7k/cleanup.yaml
+    when: platform | match('N7K')
+
+  - name: remove vxlan_vtep
+    nxos_vxlan_vtep:
+      interface: nve1
+      shutdown: true
+      state: absent
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+  - name: "Disable feature nv overlay"
+    nxos_feature: 
+      feature: nve
+      state: disabled
+      provider: "{{ connection }}"
+    ignore_errors: yes
+
+- debug: msg="END TRANSPORT:{{ connection.transport }} nxos_vxlan_vtep_vni sanity test"
diff -Nru ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml
--- ansible-2.4.1.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,4 @@
+---
+- set_fact: connection="{{ nxapi }}"
+
+- import_tasks: targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml
diff -Nru ansible-2.4.1.0/test/integration/targets/prepare_ios_tests/tasks/main.yml ansible-2.4.2.0/test/integration/targets/prepare_ios_tests/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/prepare_ios_tests/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/prepare_ios_tests/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -4,8 +4,6 @@
   ios_config:
     src: config.j2
     authorize: yes
-    provider: "{{ cli }}"
-
 
 # Some AWS hostnames can be longer than those allowed by the system we are testing
 # Truncate the hostname
diff -Nru ansible-2.4.1.0/test/integration/targets/prepare_nxos_tests/tasks/main.yml ansible-2.4.2.0/test/integration/targets/prepare_nxos_tests/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/prepare_nxos_tests/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/prepare_nxos_tests/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -82,6 +82,7 @@
   when: (platform | match("N9K")) and (fretta | search("true"))
 
 # Check if platform is titanium
+- set_fact: titanium="false"
 - set_fact: titanium={% for row in nxos_inventory_output.stdout_lines[0]['TABLE_inv']['ROW_inv'] if 'NX-OSv' in row['desc']%}"true"{% endfor %}
   when: platform | match("N7K")
 
diff -Nru ansible-2.4.1.0/test/integration/targets/rpm_key/tasks/rpm_key.yaml ansible-2.4.2.0/test/integration/targets/rpm_key/tasks/rpm_key.yaml
--- ansible-2.4.1.0/test/integration/targets/rpm_key/tasks/rpm_key.yaml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/rpm_key/tasks/rpm_key.yaml	2017-11-29 21:10:32.000000000 +0000
@@ -26,7 +26,7 @@
 
 - name: download sl rpm
   get_url:
-    url: https://download.fedoraproject.org/pub/epel/7/x86_64/s/sl-5.02-1.el7.x86_64.rpm
+    url: https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/s/sl-5.02-1.el7.x86_64.rpm
     dest: /tmp/sl.rpm
 
 - name: download Mono key
diff -Nru "/tmp/tmpRrz2ND/TSMWIOz7hz/ansible-2.4.1.0/test/integration/targets/script/files/space path/test.sh" "/tmp/tmpRrz2ND/8Zz4Y1n_4n/ansible-2.4.2.0/test/integration/targets/script/files/space path/test.sh"
--- "/tmp/tmpRrz2ND/TSMWIOz7hz/ansible-2.4.1.0/test/integration/targets/script/files/space path/test.sh"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpRrz2ND/8Zz4Y1n_4n/ansible-2.4.2.0/test/integration/targets/script/files/space path/test.sh"	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo -n "Script with space in path"
\ No newline at end of file
diff -Nru ansible-2.4.1.0/test/integration/targets/script/files/test_with_args.sh ansible-2.4.2.0/test/integration/targets/script/files/test_with_args.sh
--- ansible-2.4.1.0/test/integration/targets/script/files/test_with_args.sh	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/script/files/test_with_args.sh	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+for i in "$@"; do
+    echo "$i"
+done
\ No newline at end of file
diff -Nru ansible-2.4.1.0/test/integration/targets/script/tasks/main.yml ansible-2.4.2.0/test/integration/targets/script/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/script/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/script/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -20,13 +20,18 @@
 ## prep
 ##
 
-- set_fact: output_dir_test={{output_dir}}/test_script
+- set_fact:
+    output_dir_test: "{{ output_dir }}/test_script"
 
 - name: make sure our testing sub-directory does not exist
-  file: path="{{ output_dir_test }}" state=absent
+  file:
+    path: "{{ output_dir_test }}"
+    state: absent
 
 - name: create our testing sub-directory
-  file: path="{{ output_dir_test }}" state=directory
+  file:
+    path: "{{ output_dir_test }}"
+    state: directory
 
 ##
 ## script
@@ -43,36 +48,101 @@
       - "script_result0.stderr == ''"
       - "script_result0.stdout == 'win'"
 
-# creates
+- name: Execute a script with a space in the path
+  script: "'space path/test.sh'"
+  register: _space_path_test
+  tags:
+    - spacepath
 
+- name: Assert that script with space in path ran successfully
+  assert:
+    that:
+      - _space_path_test is success
+      - _space_path_test.stdout == 'Script with space in path'
+  tags:
+    - spacepath
+
+- name: Execute a script with arguments including a unicode character
+  script: test_with_args.sh -this -that -Ӧther
+  register: unicode_args
+
+- name: Assert that script with unicode character ran successfully
+  assert:
+    that:
+      - unicode_args is success
+      - unicode_args.stdout_lines[0] == '-this'
+      - unicode_args.stdout_lines[1] == '-that'
+      - unicode_args.stdout_lines[2] == '-Ӧther'
+
+# creates
 - name: verify that afile.txt is absent
-  file: path={{output_dir_test}}/afile.txt state=absent
+  file:
+    path: "{{ output_dir_test }}/afile.txt"
+    state: absent
 
 - name: create afile.txt with create_afile.sh via command
-  script: create_afile.sh {{output_dir_test | expanduser}}/afile.txt creates={{output_dir_test | expanduser}}/afile.txt
+  script: create_afile.sh {{ output_dir_test | expanduser }}/afile.txt
+  args:
+    creates: "{{ output_dir_test | expanduser }}/afile.txt"
+  register: _create_test1
+
+- name: Check state of created file
+  stat:
+    path: "{{ output_dir_test | expanduser }}/afile.txt"
+  register: _create_stat1
+
+- name: Run create_afile.sh again to ensure it is skipped
+  script: create_afile.sh {{ output_dir_test | expanduser }}/afile.txt
+  args:
+    creates: "{{ output_dir_test | expanduser }}/afile.txt"
+  register: _create_test2
+
+- name: Assert that script report a change, file was created, second run was skipped
+  assert:
+    that:
+      - _create_test1 | changed
+      - _create_stat1.stat.exists
+      - _create_test2 | skipped
 
-- name: verify that afile.txt is present
-  file: path={{output_dir_test}}/afile.txt state=file
 
 # removes
+- name: verify that afile.txt is present
+  file:
+    path: "{{ output_dir_test }}/afile.txt"
+    state: file
 
 - name: remove afile.txt with remote_afile.sh via command
-  script: remove_afile.sh {{output_dir_test | expanduser}}/afile.txt removes={{output_dir_test | expanduser}}/afile.txt
-  register: script_result1
+  script: remove_afile.sh {{ output_dir_test | expanduser }}/afile.txt
+  args:
+    removes: "{{ output_dir_test | expanduser }}/afile.txt"
+  register: _remove_test1
+
+- name: Check state of removed file
+  stat:
+    path: "{{ output_dir_test | expanduser }}/afile.txt"
+  register: _remove_stat1
+
+- name: Run remote_afile.sh again to enure it is skipped
+  script: remove_afile.sh {{ output_dir_test | expanduser }}/afile.txt
+  args:
+    removes: "{{ output_dir_test | expanduser }}/afile.txt"
+  register: _remove_test2
 
-- name: verify that afile.txt is absent
-  file: path={{output_dir_test}}/afile.txt state=absent
-  register: script_result2
-
-- name: assert that the file was removed by the script
+- name: Assert that script report a change, file was removed, second run was skipped
   assert:
     that:
-      - "script_result1|changed"
-      - "script_result2.state == 'absent'"
+      - _remove_test1 | changed
+      - not _remove_stat1.stat.exists
+      - _remove_test2 | skipped
+
 
 # async
-- name: test task failure with async param
+- name: verify that afile.txt is absent
+  file:
+    path: "{{ output_dir_test }}/afile.txt"
+    state: absent
 
+- name: test task failure with async param
   script: /some/script.sh
   async: 2
   ignore_errors: true
@@ -81,5 +151,73 @@
 - name: assert task with async param failed
   assert:
     that:
-      - script_result3|failed
+      - script_result3 | failed
       - script_result3.msg == "async is not supported for this task."
+
+
+# check mode
+- name: Run script to create a file in check mode
+  script: create_afile.sh {{ output_dir_test | expanduser }}/afile2.txt
+  check_mode: yes
+  register: _check_mode_test
+
+- debug:
+    var: _check_mode_test
+    verbosity: 2
+
+- name: Get state of file created by script
+  stat:
+    path: "{{ output_dir_test | expanduser }}/afile2.txt"
+  register: _afile_stat
+
+- debug:
+    var: _afile_stat
+    verbosity: 2
+
+- name: Assert that a change was reported but the script did not make changes
+  assert:
+    that:
+      - _check_mode_test | changed
+      - not _afile_stat.stat.exists
+
+- name: Run script to create a file
+  script: create_afile.sh {{ output_dir_test | expanduser }}/afile2.txt
+
+- name: Run script to create a file in check mode with 'creates' argument
+  script: create_afile.sh {{ output_dir_test | expanduser }}/afile2.txt
+  args:
+    creates: "{{ output_dir_test | expanduser }}/afile2.txt"
+  register: _check_mode_test2
+  check_mode: yes
+
+- debug:
+    var: _check_mode_test2
+    verbosity: 2
+
+- name: Assert that task was skipped and mesage was returned
+  assert:
+    that:
+      - _check_mode_test2 | skipped
+      - '_check_mode_test2.msg == "skipped, since {{ output_dir_test | expanduser }}/afile2.txt exists"'
+
+- name: Remove afile2.txt
+  file:
+    path: "{{ output_dir_test | expanduser }}/afile2.txt"
+    state: absent
+
+- name: Run script to remove a file in check mode with 'removes' argument
+  script: remove_afile.sh {{ output_dir_test | expanduser }}/afile2.txt
+  args:
+    removes: "{{ output_dir_test | expanduser }}/afile2.txt"
+  register: _check_mode_test3
+  check_mode: yes
+
+- debug:
+    var: _check_mode_test3
+    verbosity: 2
+
+- name: Assert that task was skipped and message was returned
+  assert:
+    that:
+      - _check_mode_test3 | skipped
+      - '_check_mode_test3.msg == "skipped, since {{ output_dir_test | expanduser }}/afile2.txt does not exist"'
diff -Nru ansible-2.4.1.0/test/integration/targets/setup_azure/tasks/main.yml ansible-2.4.2.0/test/integration/targets/setup_azure/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/setup_azure/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/setup_azure/tasks/main.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-- name: install cryptography requirement
-  # preempt the installation of cryptography from requirements-azure.txt to limit the version installed
-  # requests[security] requires cryptography >= 1.3.4
-  # cryptography 2.1 requires pip 8.1.2+
-  command: pip install cryptography>=1.3.4,<2.1
-
-- pip:
-    requirements: '{{ role_path }}/../../../../packaging/requirements/requirements-azure.txt'
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/broken-group-vars-tasks.yml ansible-2.4.2.0/test/integration/targets/vault/invalid_format/broken-group-vars-tasks.yml
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/broken-group-vars-tasks.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/broken-group-vars-tasks.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,23 @@
+---
+- hosts: broken-group-vars
+  gather_facts: false
+  tasks:
+    - name: EXPECTED FAILURE
+      debug:
+        msg: "some_var_that_fails: {{ some_var_that_fails }}"
+
+    - name: EXPECTED FAILURE Display hostvars
+      debug:
+        msg: "{{inventory_hostname}} hostvars: {{ hostvars[inventory_hostname] }}"
+
+
+# ansible-vault --vault-password-file=vault-secret encrypt_string test
+# !vault |
+#           $ANSIBLE_VAULT;1.1;AES256
+#           64323332393930623633306662363165386332376638653035356132646165663632616263653366
+#           6233383362313531623238613461323861376137656265380a366464663835633065616361636231
+#           39653230653538366165623664326661653135306132313730393232343432333635326536373935
+#           3366323866663763660a323766383531396433663861656532373663373134376263383263316261
+#           3137
+
+# $ ansible-playbook -i inventory --vault-password-file=vault-secret tasks.yml 
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/broken-host-vars-tasks.yml ansible-2.4.2.0/test/integration/targets/vault/invalid_format/broken-host-vars-tasks.yml
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/broken-host-vars-tasks.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/broken-host-vars-tasks.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,7 @@
+---
+- hosts: broken-host-vars
+  gather_facts: false
+  tasks:
+    - name: EXPECTED FAILURE Display hostvars
+      debug:
+        msg: "{{inventory_hostname}} hostvars: {{ hostvars[inventory_hostname] }}"
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/group_vars/broken-group-vars.yml ansible-2.4.2.0/test/integration/targets/vault/invalid_format/group_vars/broken-group-vars.yml
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/group_vars/broken-group-vars.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/group_vars/broken-group-vars.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,8 @@
+$ANSIBLE_VAULT;1.1;AES256
+64306566356165343030353932383461376334336665626135343932356431383134306338353664
+6435326361306561633165633536333234306665346437330a366265346466626464396264393262
+34616366626565336637653032336465363165363334356535353833393332313239353736623237
+6434373738633039650a353435303366323139356234616433613663626334643939303361303764
+3636363333333333333333333
+36313937643431303637353931366363643661396238303530323262326334343432383637633439
+6365373237336535353661356430313965656538363436333836
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/host_vars/broken-host-vars.example.com/vars ansible-2.4.2.0/test/integration/targets/vault/invalid_format/host_vars/broken-host-vars.example.com/vars
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/host_vars/broken-host-vars.example.com/vars	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/host_vars/broken-host-vars.example.com/vars	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,11 @@
+---
+example_vars:
+  some_key:
+    another_key: some_value
+    bad_vault_dict_key: !vault |
+      $ANSIBLE_VAULT;1.1;AES256
+      64323332393930623633306662363165386332376638653035356132646165663632616263653366
+      623338xyz2313531623238613461323861376137656265380a366464663835633065616361636231
+      3366323866663763660a323766383531396433663861656532373663373134376263383263316261
+      3137
+
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/inventory ansible-2.4.2.0/test/integration/targets/vault/invalid_format/inventory
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/inventory	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/inventory	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,5 @@
+[broken-group-vars]
+broken.example.com
+
+[broken-host-vars]
+broken-host-vars.example.com
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/original-broken-host-vars ansible-2.4.2.0/test/integration/targets/vault/invalid_format/original-broken-host-vars
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/original-broken-host-vars	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/original-broken-host-vars	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,6 @@
+$ANSIBLE_VAULT;1.1;AES256
+64323332393930623633306662363165386332376638653035356132646165663632616263653366
+6233383362313531623238613461323861376137656265380a366464663835633065616361636231
+3366323866663763660a323766383531396433663861656532373663373134376263383263316261
+3137
+
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/original-group-vars.yml ansible-2.4.2.0/test/integration/targets/vault/invalid_format/original-group-vars.yml
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/original-group-vars.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/original-group-vars.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+---
+some_var_that_fails: blippy
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/README.md ansible-2.4.2.0/test/integration/targets/vault/invalid_format/README.md
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/README.md	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/README.md	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1 @@
+Based on https://github.com/yves-vogl/ansible-inline-vault-issue
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/some-vars ansible-2.4.2.0/test/integration/targets/vault/invalid_format/some-vars
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/some-vars	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/some-vars	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,6 @@
+$ANSIBLE_VAULT;1.1;AES256
+37303462633933386339386465613039363964643466663866356261313966663465646262636333
+3965643566363764356563363334363431656661636634380a333837343065326239336639373238
+64316236383836383434366662626339643561616630326137383262396331396538363136323063
+6236616130383264620a613863373631316234656236323332633166623738356664353531633239
+3533
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/invalid_format/vault-secret ansible-2.4.2.0/test/integration/targets/vault/invalid_format/vault-secret
--- ansible-2.4.1.0/test/integration/targets/vault/invalid_format/vault-secret	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/invalid_format/vault-secret	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1 @@
+enemenemu
\ No newline at end of file
diff -Nru ansible-2.4.1.0/test/integration/targets/vault/runme.sh ansible-2.4.2.0/test/integration/targets/vault/runme.sh
--- ansible-2.4.1.0/test/integration/targets/vault/runme.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vault/runme.sh	2017-11-29 21:10:32.000000000 +0000
@@ -23,8 +23,48 @@
 FORMAT_1_1_HEADER="\$ANSIBLE_VAULT;1.1;AES256"
 FORMAT_1_2_HEADER="\$ANSIBLE_VAULT;1.2;AES256"
 
+
 VAULT_PASSWORD_FILE=vault-password
 
+# Use linux setsid to test without a tty. No setsid if osx/bsd though...
+if [ -x "$(command -v setsid)" ]; then
+    # tests related to https://github.com/ansible/ansible/issues/30993
+    CMD='ansible-playbook -vvvvv --ask-vault-pass test_vault.yml'
+    setsid sh -c "echo test-vault-password|${CMD}" < /dev/null > log 2>&1 && :
+    WRONG_RC=$?
+    cat log
+    echo "rc was $WRONG_RC (0 is expected)"
+    [ $WRONG_RC -eq 0 ]
+
+    setsid sh -c 'tty; ansible-vault --ask-vault-pass -vvvvv view test_vault.yml' < /dev/null > log 2>&1 && :
+    WRONG_RC=$?
+    echo "rc was $WRONG_RC (1 is expected)"
+    [ $WRONG_RC -eq 1 ]
+    cat log
+
+    setsid sh -c 'tty; echo passbhkjhword|ansible-playbook -vvvvv --ask-vault-pass test_vault.yml' < /dev/null > log 2>&1 && :
+    WRONG_RC=$?
+    echo "rc was $WRONG_RC (1 is expected)"
+    [ $WRONG_RC -eq 1 ]
+    cat log
+
+    setsid sh -c 'tty; echo test-vault-password |ansible-playbook -vvvvv --ask-vault-pass test_vault.yml' < /dev/null > log 2>&1
+    echo $?
+    cat log
+
+    setsid sh -c 'tty; echo test-vault-password|ansible-playbook -vvvvv --ask-vault-pass test_vault.yml' < /dev/null > log 2>&1
+    echo $?
+    cat log
+
+    setsid sh -c 'tty; echo test-vault-password |ansible-playbook -vvvvv --ask-vault-pass test_vault.yml' < /dev/null > log 2>&1
+    echo $?
+    cat log
+
+    setsid sh -c 'tty; echo test-vault-password|ansible-vault --ask-vault-pass -vvvvv view vaulted.inventory' < /dev/null > log 2>&1
+    echo $?
+    cat log
+fi
+
 # old format
 ansible-vault view "$@" --vault-password-file vault-password-ansible format_1_0_AES.yml
 
@@ -359,3 +399,9 @@
 echo "rc was $WRONG_RC (1 is expected)"
 [ $WRONG_RC -eq 1 ]
 
+# test invalid format ala https://github.com/ansible/ansible/issues/28038
+EXPECTED_ERROR='Vault format unhexlify error: Non-hexadecimal digit found'
+ansible-playbook "$@" -i invalid_format/inventory --vault-id invalid_format/vault-secret invalid_format/broken-host-vars-tasks.yml 2>&1 | grep "${EXPECTED_ERROR}"
+
+EXPECTED_ERROR='Vault format unhexlify error: Odd-length string'
+ansible-playbook "$@" -i invalid_format/inventory --vault-id invalid_format/vault-secret invalid_format/broken-group-vars-tasks.yml 2>&1 | grep "${EXPECTED_ERROR}"
diff -Nru ansible-2.4.1.0/test/integration/targets/vyos_command/aliases ansible-2.4.2.0/test/integration/targets/vyos_command/aliases
--- ansible-2.4.1.0/test/integration/targets/vyos_command/aliases	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/vyos_command/aliases	2017-11-29 21:10:32.000000000 +0000
@@ -1,2 +1 @@
 network/ci
-skip/python3
diff -Nru ansible-2.4.1.0/test/integration/targets/win_find/defaults/main.yml ansible-2.4.2.0/test/integration/targets/win_find/defaults/main.yml
--- ansible-2.4.1.0/test/integration/targets/win_find/defaults/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_find/defaults/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -1 +1,2 @@
 win_find_dir: "{{win_output_dir}}\\win_find"
+test_win_find_username: testuser
diff -Nru ansible-2.4.1.0/test/integration/targets/win_find/files/set_attributes.ps1 ansible-2.4.2.0/test/integration/targets/win_find/files/set_attributes.ps1
--- ansible-2.4.1.0/test/integration/targets/win_find/files/set_attributes.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_find/files/set_attributes.ps1	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-$path = $args[0]
-$attr = $args[1]
-$item = Get-Item "$path"
-
-$attributes = $item.Attributes -split ','
-If ($attributes -notcontains $attr) {
-    $attributes += $attr
-}
-$item.Attributes = $attributes -join ','
diff -Nru ansible-2.4.1.0/test/integration/targets/win_find/files/set_filedate.ps1 ansible-2.4.2.0/test/integration/targets/win_find/files/set_filedate.ps1
--- ansible-2.4.1.0/test/integration/targets/win_find/files/set_filedate.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_find/files/set_filedate.ps1	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-$date = Get-Date -Year 2016 -Month 11 -Day 1 -Hour 7 -Minute 10 -Second 5 -Millisecond 0
-
-$item = Get-Item -Path "$($args[0])"
-$item.CreationTime = $date
-$item.LastAccessTime = $date
-$item.LastWriteTime = $date
diff -Nru ansible-2.4.1.0/test/integration/targets/win_find/files/set_share.ps1 ansible-2.4.2.0/test/integration/targets/win_find/files/set_share.ps1
--- ansible-2.4.1.0/test/integration/targets/win_find/files/set_share.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_find/files/set_share.ps1	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-$share_name = $args[1]
-$share_stat = Get-WmiObject -Class Win32_Share -Filter "name='$share_name'"
-If ($share_stat) {
-    $share_stat.Delete()
-}
-$wmi = [wmiClass] 'Win32_Share'
-$wmi.Create($args[0], $share_name, 0)
diff -Nru ansible-2.4.1.0/test/integration/targets/win_find/tasks/main.yml ansible-2.4.2.0/test/integration/targets/win_find/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/win_find/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_find/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -1,736 +1,110 @@
 ---
 - name: ensure the testing directory is cleared before setting up test
   win_file:
-    path: "{{win_find_dir}}"
+    path: '{{win_find_dir}}'
     state: absent
 
-- name: ensure testing directories exist
-  win_file:
-    path: "{{item}}"
-    state: directory
-  with_items:
-  - '{{win_find_dir}}\nested'
-  - '{{win_find_dir}}\single'
-  - '{{win_find_dir}}\link-dest'
-  - '{{win_find_dir}}\link-dest\sub-link'
-  - '{{win_find_dir}}\hard-link-dest'
-  - '{{win_find_dir}}\junction-link-dest'
-  - '{{win_find_dir}}\broken-link-dest'
-  - '{{win_find_dir}}\nested\sub-nest'
-  - '{{win_find_dir}}\shared'
-  - '{{win_find_dir}}\shared\folder'
-  - '{{win_find_dir}}\hidden'
-  - '{{win_find_dir}}\date'
-  - '{{win_find_dir}}\emptynested\nest\dir1'
-  - '{{win_find_dir}}\emptynested\nest\dir2'
-
-- name: create empty test files
-  win_file:
-    path: "{{item}}"
-    state: touch
-  with_items:
-  - "{{win_find_dir}}\\nested\\file.ps1"
-  - "{{win_find_dir}}\\nested\\test.ps1"
-  - "{{win_find_dir}}\\nested\\out.log"
-  - "{{win_find_dir}}\\nested\\archive.log"
-  - "{{win_find_dir}}\\nested\\sub-nest\\test.ps1"
-  - "{{win_find_dir}}\\nested\\sub-nest\\readonly.txt"
-  - "{{win_find_dir}}\\link-dest\\link.ps1"
-  - "{{win_find_dir}}\\single\\large.ps1"
-  - "{{win_find_dir}}\\single\\small.ps1"
-  - "{{win_find_dir}}\\single\\test.ps1"
-  - "{{win_find_dir}}\\single\\hidden.ps1"
-  - "{{win_find_dir}}\\date\\new.ps1"
-  - "{{win_find_dir}}\\date\\old.ps1"
-  - "{{win_find_dir}}\\single\\out_20161101-091005.log"
-  - "{{win_find_dir}}\\hidden\\out_20161101-091005.log"
-  - "{{win_find_dir}}\\hard-link-dest\\file-abc.log"
-
-- name: populate files with a test string
-  win_lineinfile:
-    dest: "{{item.path}}"
-    line: "{{item.text}}"
-  with_items:
-  - { 'path': "{{win_find_dir}}\\nested\\file.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\nested\\test.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\nested\\out.log", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\nested\\archive.log", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\nested\\sub-nest\\test.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\nested\\sub-nest\\readonly.txt", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\link-dest\\link.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\single\\test.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\single\\hidden.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\date\\new.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\date\\old.ps1", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\single\\out_20161101-091005.log", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\hidden\\out_20161101-091005.log", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\hard-link-dest\\file-abc.log", 'text': 'abcdefg1234567' }
-  - { 'path': "{{win_find_dir}}\\single\\small.ps1", 'text': "a" }
-  - { 'path': "{{win_find_dir}}\\date\\new.ps1", 'text': "random text for new date" }
-  - { 'path': "{{win_find_dir}}\\date\\old.ps1", 'text': "random text for old date" }
-
-- name: populate large text file
-  win_command: powershell "Set-Content {{win_find_dir}}\\single\\large.ps1 ('abcdefghijklmnopqrstuvwxyz' * 10000)"
-
-- name: create share
-  script: set_share.ps1 "{{win_find_dir}}\shared\folder" "folder-share"
-
-- name: create links
-  win_command: cmd.exe /c mklink /{{item.type}} "{{item.source}}" "{{item.target}}"
-  with_items:
-  - { type: 'D', source: "{{win_find_dir}}\\nested\\link", target: "{{win_find_dir}}\\link-dest" }
-  - { type: 'D', source: "{{win_find_dir}}\\broken-link", target: "{{win_find_dir}}\\broken-link-dest" }
-  - { type: 'H', source: "{{win_find_dir}}\\hard-link-dest\\hard-link.log", target: "{{win_find_dir}}\\hard-link-dest\\file-abc.log" }
-  - { type: 'J', source: "{{win_find_dir}}\\junction-link", target: "{{win_find_dir}}\\junction-link-dest" }
-
-- name: set modification date on files/folders
-  script: set_filedate.ps1 "{{item}}"
-  with_items:
-  - "{{win_find_dir}}\\nested\\file.ps1"
-  - "{{win_find_dir}}\\nested\\test.ps1"
-  - "{{win_find_dir}}\\nested\\out.log"
-  - "{{win_find_dir}}\\nested\\archive.log"
-  - "{{win_find_dir}}\\nested\\sub-nest\\test.ps1"
-  - "{{win_find_dir}}\\nested\\sub-nest\\readonly.txt"
-  - "{{win_find_dir}}\\link-dest\\link.ps1"
-  - "{{win_find_dir}}\\single\\large.ps1"
-  - "{{win_find_dir}}\\single\\small.ps1"
-  - "{{win_find_dir}}\\single\\test.ps1"
-  - "{{win_find_dir}}\\single\\hidden.ps1"
-  - "{{win_find_dir}}\\date\\old.ps1"
-  - "{{win_find_dir}}\\single\\out_20161101-091005.log"
-  - "{{win_find_dir}}\\hidden\\out_20161101-091005.log"
-  - "{{win_find_dir}}\\hard-link-dest\\file-abc.log"
-  - "{{win_find_dir}}\\nested"
-  - "{{win_find_dir}}\\single"
-  - "{{win_find_dir}}\\link-dest"
-  - "{{win_find_dir}}\\link-dest\\sub-link"
-  - "{{win_find_dir}}\\hard-link-dest"
-  - "{{win_find_dir}}\\junction-link-dest"
-  - "{{win_find_dir}}\\broken-link-dest"
-  - "{{win_find_dir}}\\nested\\sub-nest"
-  - "{{win_find_dir}}\\shared"
-  - "{{win_find_dir}}\\shared\\folder"
-  - "{{win_find_dir}}\\hidden"
-  - "{{win_find_dir}}\\date"
-
-- name: set file attributes for test
-  script: set_attributes.ps1 "{{item.path}}" {{item.attr}}
-  with_items:
-  - { 'path': "{{win_find_dir}}\\hidden", 'attr': "Hidden" }
-  - { 'path': "{{win_find_dir}}\\date", 'attr': "Hidden" }
-  - { 'path': "{{win_find_dir}}\\nested\\archive.log", 'attr': "Archive" }
-  - { 'path': "{{win_find_dir}}\\nested\\sub-nest\\readonly.txt", 'attr': "ReadOnly" }
-  - { 'path': "{{win_find_dir}}\\single\\hidden.ps1", 'attr': "Hidden" }
-
-- name: break the broken link target
-  win_file:
-    path: "{{win_find_dir}}\\broken-link-dest"
-    state: absent
-# end test setup
-
-- name: expect failure when not setting paths
-  win_find:
-    patterns: a
-  register: actual
-  failed_when: "actual.msg != 'Get-AnsibleParam: Missing required argument: paths'"
-
-- name: expect failure when setting paths to a file
-  win_find:
-    paths: "{{win_output_dir}}\\win_find\\single\\large.ps1"
-  register: actual
-  failed_when: actual.msg != 'Argument path ' + win_output_dir + '\\win_find\\single\\large.ps1 is a file not a directory'
-
-- name: expect failure whe path is set to a non existent folder
-  win_find:
-    paths: "{{win_output_dir}}\\win_find\\thisisafakefolder"
-  register: actual
-  failed_when: actual.msg != 'Argument path ' + win_output_dir + '\\win_find\\thisisafakefolder does not exist cannot get information on'
-
-- name: get files in single directory
-  win_find:
-    paths: "{{win_output_dir}}\\win_find\\single"
-  register: actual
-
-- name: set expected value for files in a single directory
-  set_fact:
-    expected:
-      changed: False
-      examined: 5
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: f8d100cdcf0e6c1007db2f8dd0b7ee2884df89af,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: large.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\large.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 260002 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .log,
-          filename: out_20161101-091005.log,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\out_20161101-091005.log",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: small.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\small.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 1 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: test.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\test.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      matched: 4
-
-- name: assert actual == expected
-  assert:
-    that: actual == expected
-
-- name: find hidden files
-  win_find:
-    paths: ['{{win_find_dir}}\\single', '{{win_find_dir}}\\nested']
-    hidden: True
-  register: actual
-
-- name: set fact for hidden files
-  set_fact:
-    expected:
-      changed: False
-      examined: 11
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: "Hidden, Archive",
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: hidden.ps1,
-          ishidden: True,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\hidden.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      matched: 1
-
-- name: assert actual == expected
-  assert:
-    that: actual == expected
-
-- name: find file based on pattern
-  win_find:
-    paths: '{{win_find_dir}}\\single'
-    patterns: ['*.log', 'out_*']
-  register: actual_pattern
-
-- name: find file based on pattern regex
-  win_find:
-    paths: '{{win_find_dir}}\\single'
-    patterns: "out_\\d{8}-\\d{6}.log"
-    use_regex: True
-  register: actual_regex
-
-- name: set fact for pattern files
-  set_fact:
-    expected:
-      changed: False
-      examined: 5
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .log,
-          filename: out_20161101-091005.log,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\out_20161101-091005.log",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      matched: 1
-
-- name: assert actual == expected
-  assert:
-    that: 
-    - actual_pattern == expected
-    - actual_regex == expected
-
-- name: find files with recurse set
-  win_find:
-    paths: "{{win_find_dir}}\\nested"
-    recurse: True
-    patterns: "*.ps1"
-  register: actual
-
-- name: set expected value for files in a nested directory
-  set_fact:
-    expected:
-      changed: False
-      examined: 8
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: test.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\sub-nest\\test.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: file.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\file.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: test.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\test.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      matched: 3
-
-- name: assert actual == expected
-  assert:
-    that: actual == expected
-
-- name: find files with recurse set and follow links
-  win_find:
-    paths: "{{win_find_dir}}\\nested"
-    recurse: True
-    follow: True
-    patterns: "*.ps1"
-  register: actual
-
-- name: set expected value for files in a nested directory while following links
-  set_fact:
-    expected:
-      changed: False
-      examined: 10
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: link.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\link\\link.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: test.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\sub-nest\\test.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: file.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\file.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
-          creationtime: 1477984205,
-          extension: .ps1,
-          filename: test.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\nested\\test.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 14 }
-      matched: 4
-
-- name: assert actual == expected
-  assert:
-    that: actual == expected
-
-- name: find directories
-  win_find:
-    paths: "{{win_find_dir}}\\link-dest"
-    file_type: directory
-  register: actual
-
-- name: set expected fact for directories with recurse and follow
-  set_fact:
-    expected:
-      changed: False
-      examined: 2
-      failed: False
-      files:
-      - { isarchive: False,
-          attributes: Directory,
-          creationtime: 1477984205,
-          filename: sub-link,
-          ishidden: False,
-          isdir: True,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\link-dest\\sub-link",
-          isreadonly: False,
-          isshared: False,
-          size: 0 }
-      matched: 1
-
-- name: assert actual == expected
-  assert:
-    that: actual == expected
-
-- name: find directories recurse and follow with a broken link
-  win_find:
-    paths: "{{win_find_dir}}"
-    file_type: directory
-    recurse: True
-    follow: True
-  register: actual
-
-- name: check directory count with recurse and follow is correct
-  assert:
-    that:
-    - actual.examined == 37
-    - actual.matched == 17
-    - actual.files[0].filename == 'broken-link'
-    - actual.files[0].islnk == True
-    - actual.files[6].filename == 'junction-link'
-    - actual.files[6].islnk == True
-    - actual.files[6].lnk_source == win_find_dir + '\\junction-link-dest'
-    - actual.files[11].filename == 'link'
-    - actual.files[11].islnk == True
-    - actual.files[11].lnk_source == win_find_dir + '\\link-dest'
-    - actual.files[15].filename == 'folder'
-    - actual.files[15].islnk == False
-    - actual.files[15].isshared == True
-    - actual.files[15].sharename == 'folder-share'
-
-- name: filter files by size without byte specified
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    size: 260002
-  register: actual_without_byte
-
-- name: filter files by size with byte specified
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    size: 253k
-  register: actual_with_byte
-
-- name: set expected fact for files by size
-  set_fact:
-    expected:
-      changed: False
-      examined: 5
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: f8d100cdcf0e6c1007db2f8dd0b7ee2884df89af,
-          creationtime: 1477984205,
-          extension: ".ps1",
-          filename: large.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\large.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 260002 }
-      matched: 1
-
-- name: assert actual == expected
-  assert:
-    that: 
-    - actual_without_byte == expected
-    - actual_with_byte == expected
-
-- name: filter files by size (less than) without byte specified
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    size: -4
-  register: actual_without_byte
-
-- name: filter files by size (less than) with byte specified
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    size: -4b
-  register: actual_with_byte
-
-- name: set expected fact for files by size (less than)
-  set_fact:
-    expected:
-      changed: False
-      examined: 5
-      failed: False
-      files:
-      - { isarchive: True,
-          attributes: Archive,
-          checksum: 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8,
-          creationtime: 1477984205,
-          extension: ".ps1",
-          filename: small.ps1,
-          ishidden: False,
-          isdir: False,
-          islnk: False,
-          lastaccesstime: 1477984205,
-          lastwritetime: 1477984205,
-          owner: BUILTIN\Administrators,
-          path: "{{win_find_dir}}\\single\\small.ps1",
-          isreadonly: False,
-          isshared: False,
-          size: 1 }
-      matched: 1
-
-- name: assert actual == expected
-  assert:
-    that: 
-    - actual_without_byte == expected
-    - actual_with_byte == expected
-
-# For dates we cannot assert against expected as the times change, this is a poor mans attempt at testing
-- name: filter files by age without unit specified
-  win_find:
-    paths: "{{win_find_dir}}\\date"
-    age: 3600
-  register: actual_without_unit
-
-- name: filter files by age with unit specified
-  win_find:
-    paths: "{{win_find_dir}}\\date"
-    age: 1h
-  register: actual_with_unit
-
-- name: assert dates match each other
-  assert:
-    that:
-    - actual_without_unit == actual_with_unit
-    - actual_without_unit.matched == 1
-    - actual_without_unit.files[0].checksum == '031a04ecc76f794d7842651de732075dec6fef04'
-    - actual_without_unit.files[0].path == win_find_dir + '\\date\\old.ps1'
-
-- name: filter files by age (newer than) without unit specified
-  win_find:
-    paths: "{{win_find_dir}}\\date"
-    age: -3600
-  register: actual_without_unit
-
-- name: filter files by age (newer than) without unit specified
-  win_find:
-    paths: "{{win_find_dir}}\\date"
-    age: -1h
-  register: actual_with_unit
-
-- name: assert dates match each other
-  assert:
-    that:
-    - actual_without_unit == actual_with_unit
-    - actual_without_unit.matched == 1
-    - actual_without_unit.files[0].checksum == '7454f04e3ac587f711a416f4edf26507255e0a2e'
-    - actual_without_unit.files[0].path == win_find_dir + '\\date\\new.ps1'
-
-- name: get list of files with md5 checksum
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    patterns: test.ps1
-    checksum_algorithm: md5
-  register: actual_md5_checksum
-
-- name: assert md5 checksum value
-  assert:
-    that:
-    - actual_md5_checksum.files[0].checksum == 'd1713d0f1d2e8fae230328d8fd59de01'
+# while most of the setup can be done with modules, it is quicker to do them
+# all in bulk than with with_items to save each round trip over WinRM
+- name: set test files and folders
+  win_shell: |
+    $directories = @(
+        "nested",
+        "single",
+        "link-dest\sub-link",
+        "hard-link-dest",
+        "junction-link-dest",
+        "broken-link-dest",
+        "nested\sub-nest",
+        "shared\folder",
+        "hidden",
+        "date",
+        "emptynested\nest\dir1",
+        "emptynested\nest\dir2"
+    )
+    foreach ($directory in $directories) {
+        New-Item -Path "{{win_find_dir}}\$directory" -ItemType Directory
+    }
+
+    $normal_content = "abcdefg1234567"
+    $normal_files = @(
+        "nested\file.ps1",
+        "nested\test.ps1",
+        "nested\out.log",
+        "nested\archive.log",
+        "nested\sub-nest\test.ps1",
+        "nested\sub-nest\readonly.txt",
+        "link-dest\link.ps1",
+        "single\test.ps1",
+        "single\hidden.ps1",
+        "single\out_20161101-091005.log",
+        "hidden\out_20161101-091005.log",
+        "hard-link-dest\file-abc.log"
+    )
+    foreach ($file in $normal_files) {
+        New-Item -Path "{{win_find_dir}}\$file" -ItemType File
+        [System.IO.File]::WriteAllText("{{win_find_dir}}\$file", $normal_content)
+    }
+
+    New-Item -Path "{{win_find_dir}}\single\small.ps1" -ItemType File
+    [System.IO.File]::WriteAllText("{{win_find_dir}}\single\small.ps1", "a")
+
+    New-Item -Path "{{win_find_dir}}\date\new.ps1" -ItemType File
+    [System.IO.File]::WriteAllText("{{win_find_dir}}\date\new.ps1", "random text for new date")
+
+    New-Item -Path "{{win_find_dir}}\date\old.ps1" -ItemType File
+    [System.IO.File]::WriteAllText("{{win_find_dir}}\date\old.ps1", "random text for old date")
+
+    New-Item -Path "{{win_find_dir}}\single\large.ps1" -ItemType File
+    Set-Content -Path "{{win_find_dir}}\single\large.ps1" -Value ('abcdefghijklmnopqrstuvwxyz' * 10000)
+
+    $share_stat = Get-WmiObject -Class Win32_Share -Filter "name='folder-share'"
+    if ($share_stat) {
+        $share_stat.Delete()
+    }
+    $wmi = [wmiClass] 'Win32_Share'
+    $wmi.Create("{{win_find_dir}}\shared\folder", "folder-share", 0)
+
+    cmd.exe /c mklink /D "{{win_find_dir}}\nested\link" "{{win_find_dir}}\link-dest"
+    cmd.exe /c mklink /D "{{win_find_dir}}\broken-link" "{{win_find_dir}}\broken-link-dest"
+    cmd.exe /c mklink /H "{{win_find_dir}}\hard-link-dest\hard-link.log" "{{win_find_dir}}\hard-link-dest\file-abc.log"
+    cmd.exe /c mklink /J "{{win_find_dir}}\junction-link" "{{win_find_dir}}\junction-link-dest"
   
-- name: get list of files with sha1 checksum
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    patterns: test.ps1
-    checksum_algorithm: sha1
-  register: actual_sha1_checksum
-
-- name: assert sha1 checksum value
-  assert:
-    that:
-    - actual_sha1_checksum.files[0].checksum == '8df33cee3325596517df5bb5aa980cf9c5c1fda3'
-
-- name: get list of files with sha256 checksum
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    patterns: test.ps1
-    checksum_algorithm: sha256
-  register: actual_sha256_checksum
-
-- name: assert sha256 checksum value
-  assert:
-    that:
-    - actual_sha256_checksum.files[0].checksum == 'c20d2eba7ffda0079812721b6f4e4e109e2f0c5e8cc3d1273a060df6f7d9f339'
-
-- name: get list of files with sha384 checksum
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    patterns: test.ps1
-    checksum_algorithm: sha384
-  register: actual_sha384_checksum
-
-- name: assert sha384 checksum value
-  assert:
-    that:
-    - actual_sha384_checksum.files[0].checksum == 'aed515eb216b9c7009ae8c4680f46c1e22004528b231aa0482a8587543bca47d3504e9f77e884eb2d11b2f9f5dc01651'
-
-- name: get list of files with sha512 checksum
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    patterns: test.ps1
-    checksum_algorithm: sha512
-  register: actual_sha512_checksum
-
-- name: assert sha512 checksum value
-  assert:
-    that:
-    - actual_sha512_checksum.files[0].checksum == '05abf64a68c4731699c23b4fc6894a36646fce525f3c96f9cf743b5d0c3bfd933dad0e95e449e3afe1f74d534d69a53b8f46cf835763dd42915813c897b02b87'
-
-- name: get list of files without checksum
-  win_find:
-    paths: "{{win_find_dir}}\\single"
-    patterns: test.ps1
-    get_checksum: False
-  register: actual_no_checksum
-
-- name: assert no checksum is returned
-  assert:
-    that:
-    - actual_no_checksum.files[0].checksum is undefined
-
-# https://github.com/ansible/ansible/issues/26158
-- name: get list of files in an empty nested directory
-  win_find:
-    paths: '{{win_find_dir}}\emptynested'
-  register: actual_empty_nested
-
-- name: assert get list of files in an empty nested directory
-  assert:
-    that:
-    - actual_empty_nested.matched == 0
-
-- name: remove testing folder
-  win_file:
-    path: "{{win_find_dir}}"
-    state: absent
+    $date = Get-Date -Year 2016 -Month 11 -Day 1 -Hour 7 -Minute 10 -Second 5 -Millisecond 0
+    Get-ChildItem -Path "{{win_find_dir}}" -Recurse | Where-Object { $_.Name -ne "new.ps1" } | ForEach-Object {
+        $_.CreationTime = $date
+        $_.LastAccessTime = $date
+        $_.LastWriteTime = $date
+    }
+
+    $attributes = @{
+        "hidden" = "Hidden"
+        "date" = "Hidden"
+        "nested\archive.log" = "Archive"
+        "nested\sub-nest\readonly.txt" = "ReadOnly"
+        "single\hidden.ps1" = "Hidden"
+    }
+    foreach ($attribute in $attributes.GetEnumerator()) {
+        $item = Get-Item -Path "{{win_find_dir}}\$($attribute.Name)"
+        $file_attributes = $item.Attributes -split ','
+        if ($file_attributes -notcontains $attribute.Value) {
+            $file_attributes += $attribute.Value
+        }
+        $item.Attributes = $file_attributes -join ','
+    }
+
+    Remove-Item -Path "{{win_find_dir}}\broken-link-dest" -Force
+
+- block:
+  - include_tasks: tests.yml
+
+  always:
+  - name: remove test user
+    win_user:
+      name: '{{test_win_find_username}}'
+      state: absent
+
+  - name: remove testing folder
+    win_file:
+      path: '{{win_find_dir}}'
+      state: absent
diff -Nru ansible-2.4.1.0/test/integration/targets/win_find/tasks/tests.yml ansible-2.4.2.0/test/integration/targets/win_find/tasks/tests.yml
--- ansible-2.4.1.0/test/integration/targets/win_find/tasks/tests.yml	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_find/tasks/tests.yml	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,662 @@
+---
+- name: expect failure when not setting paths
+  win_find:
+    patterns: a
+  register: actual
+  failed_when: "actual.msg != 'Get-AnsibleParam: Missing required argument: paths'"
+
+- name: expect failure when setting paths to a file
+  win_find:
+    paths: "{{win_output_dir}}\\win_find\\single\\large.ps1"
+  register: actual
+  failed_when: actual.msg != 'Argument path ' + win_output_dir + '\\win_find\\single\\large.ps1 is a file not a directory'
+
+- name: expect failure when path is set to a non existent folder
+  win_find:
+    paths: "{{win_output_dir}}\\win_find\\thisisafakefolder"
+  register: actual
+  failed_when: actual.msg != 'Argument path ' + win_output_dir + '\\win_find\\thisisafakefolder does not exist cannot get information on'
+
+- name: get files in single directory
+  win_find:
+    paths: "{{win_output_dir}}\\win_find\\single"
+  register: actual
+
+- name: set expected value for files in a single directory
+  set_fact:
+    expected:
+      changed: False
+      examined: 5
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: f8d100cdcf0e6c1007db2f8dd0b7ee2884df89af,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: large.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\large.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 260002 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .log,
+          filename: out_20161101-091005.log,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\out_20161101-091005.log",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: small.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\small.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 1 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: test.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\test.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      matched: 4
+
+- name: assert actual == expected
+  assert:
+    that: actual == expected
+
+- name: find hidden files
+  win_find:
+    paths: ['{{win_find_dir}}\\single', '{{win_find_dir}}\\nested']
+    hidden: True
+  register: actual
+
+- name: set fact for hidden files
+  set_fact:
+    expected:
+      changed: False
+      examined: 11
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: "Hidden, Archive",
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: hidden.ps1,
+          ishidden: True,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\hidden.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      matched: 1
+
+- name: assert actual == expected
+  assert:
+    that: actual == expected
+
+- name: find file based on pattern
+  win_find:
+    paths: '{{win_find_dir}}\\single'
+    patterns: ['*.log', 'out_*']
+  register: actual_pattern
+
+- name: find file based on pattern regex
+  win_find:
+    paths: '{{win_find_dir}}\\single'
+    patterns: "out_\\d{8}-\\d{6}.log"
+    use_regex: True
+  register: actual_regex
+
+- name: set fact for pattern files
+  set_fact:
+    expected:
+      changed: False
+      examined: 5
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .log,
+          filename: out_20161101-091005.log,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\out_20161101-091005.log",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      matched: 1
+
+- name: assert actual == expected
+  assert:
+    that: 
+    - actual_pattern == expected
+    - actual_regex == expected
+
+- name: find files with recurse set
+  win_find:
+    paths: "{{win_find_dir}}\\nested"
+    recurse: True
+    patterns: "*.ps1"
+  register: actual
+
+- name: set expected value for files in a nested directory
+  set_fact:
+    expected:
+      changed: False
+      examined: 8
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: test.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\sub-nest\\test.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: file.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\file.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: test.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\test.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      matched: 3
+
+- name: assert actual == expected
+  assert:
+    that: actual == expected
+
+- name: find files with recurse set and follow links
+  win_find:
+    paths: "{{win_find_dir}}\\nested"
+    recurse: True
+    follow: True
+    patterns: "*.ps1"
+  register: actual
+
+- name: set expected value for files in a nested directory while following links
+  set_fact:
+    expected:
+      changed: False
+      examined: 10
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: link.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\link\\link.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: test.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\sub-nest\\test.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: file.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\file.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 8df33cee3325596517df5bb5aa980cf9c5c1fda3,
+          creationtime: 1477984205,
+          extension: .ps1,
+          filename: test.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\nested\\test.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 14 }
+      matched: 4
+
+- name: assert actual == expected
+  assert:
+    that: actual == expected
+
+- name: find directories
+  win_find:
+    paths: "{{win_find_dir}}\\link-dest"
+    file_type: directory
+  register: actual
+
+- name: set expected fact for directories with recurse and follow
+  set_fact:
+    expected:
+      changed: False
+      examined: 2
+      failed: False
+      files:
+      - { isarchive: False,
+          attributes: Directory,
+          creationtime: 1477984205,
+          filename: sub-link,
+          ishidden: False,
+          isdir: True,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\link-dest\\sub-link",
+          isreadonly: False,
+          isshared: False,
+          size: 0 }
+      matched: 1
+
+- name: assert actual == expected
+  assert:
+    that: actual == expected
+
+- name: find directories recurse and follow with a broken link
+  win_find:
+    paths: "{{win_find_dir}}"
+    file_type: directory
+    recurse: True
+    follow: True
+  register: actual
+
+- name: check directory count with recurse and follow is correct
+  assert:
+    that:
+    - actual.examined == 37
+    - actual.matched == 17
+    - actual.files[0].filename == 'broken-link'
+    - actual.files[0].islnk == True
+    - actual.files[6].filename == 'junction-link'
+    - actual.files[6].islnk == True
+    - actual.files[6].lnk_source == win_find_dir + '\\junction-link-dest'
+    - actual.files[11].filename == 'link'
+    - actual.files[11].islnk == True
+    - actual.files[11].lnk_source == win_find_dir + '\\link-dest'
+    - actual.files[15].filename == 'folder'
+    - actual.files[15].islnk == False
+    - actual.files[15].isshared == True
+    - actual.files[15].sharename == 'folder-share'
+
+- name: filter files by size without byte specified
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    size: 260002
+  register: actual_without_byte
+
+- name: filter files by size with byte specified
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    size: 253k
+  register: actual_with_byte
+
+- name: set expected fact for files by size
+  set_fact:
+    expected:
+      changed: False
+      examined: 5
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: f8d100cdcf0e6c1007db2f8dd0b7ee2884df89af,
+          creationtime: 1477984205,
+          extension: ".ps1",
+          filename: large.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\large.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 260002 }
+      matched: 1
+
+- name: assert actual == expected
+  assert:
+    that: 
+    - actual_without_byte == expected
+    - actual_with_byte == expected
+
+- name: filter files by size (less than) without byte specified
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    size: -4
+  register: actual_without_byte
+
+- name: filter files by size (less than) with byte specified
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    size: -4b
+  register: actual_with_byte
+
+- name: set expected fact for files by size (less than)
+  set_fact:
+    expected:
+      changed: False
+      examined: 5
+      failed: False
+      files:
+      - { isarchive: True,
+          attributes: Archive,
+          checksum: 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8,
+          creationtime: 1477984205,
+          extension: ".ps1",
+          filename: small.ps1,
+          ishidden: False,
+          isdir: False,
+          islnk: False,
+          lastaccesstime: 1477984205,
+          lastwritetime: 1477984205,
+          owner: BUILTIN\Administrators,
+          path: "{{win_find_dir}}\\single\\small.ps1",
+          isreadonly: False,
+          isshared: False,
+          size: 1 }
+      matched: 1
+
+- name: assert actual == expected
+  assert:
+    that: 
+    - actual_without_byte == expected
+    - actual_with_byte == expected
+
+# For dates we cannot assert against expected as the times change, this is a poor mans attempt at testing
+- name: filter files by age without unit specified
+  win_find:
+    paths: "{{win_find_dir}}\\date"
+    age: 3600
+  register: actual_without_unit
+
+- name: filter files by age with unit specified
+  win_find:
+    paths: "{{win_find_dir}}\\date"
+    age: 1h
+  register: actual_with_unit
+
+- name: assert dates match each other
+  assert:
+    that:
+    - actual_without_unit == actual_with_unit
+    - actual_without_unit.matched == 1
+    - actual_without_unit.files[0].checksum == 'd1185139c47f5bc951e2e9135922fe31059206b1'
+    - actual_without_unit.files[0].path == win_find_dir + '\\date\\old.ps1'
+
+- name: filter files by age (newer than) without unit specified
+  win_find:
+    paths: "{{win_find_dir}}\\date"
+    age: -3600
+  register: actual_without_unit
+
+- name: filter files by age (newer than) without unit specified
+  win_find:
+    paths: "{{win_find_dir}}\\date"
+    age: -1h
+  register: actual_with_unit
+
+- name: assert dates match each other
+  assert:
+    that:
+    - actual_without_unit == actual_with_unit
+    - actual_without_unit.matched == 1
+    - actual_without_unit.files[0].checksum == 'af99d0e98df4531b9f26c942f41d65c58766bfa9'
+    - actual_without_unit.files[0].path == win_find_dir + '\\date\\new.ps1'
+
+- name: get list of files with md5 checksum
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    patterns: test.ps1
+    checksum_algorithm: md5
+  register: actual_md5_checksum
+
+- name: assert md5 checksum value
+  assert:
+    that:
+    - actual_md5_checksum.files[0].checksum == 'd1713d0f1d2e8fae230328d8fd59de01'
+  
+- name: get list of files with sha1 checksum
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    patterns: test.ps1
+    checksum_algorithm: sha1
+  register: actual_sha1_checksum
+
+- name: assert sha1 checksum value
+  assert:
+    that:
+    - actual_sha1_checksum.files[0].checksum == '8df33cee3325596517df5bb5aa980cf9c5c1fda3'
+
+- name: get list of files with sha256 checksum
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    patterns: test.ps1
+    checksum_algorithm: sha256
+  register: actual_sha256_checksum
+
+- name: assert sha256 checksum value
+  assert:
+    that:
+    - actual_sha256_checksum.files[0].checksum == 'c20d2eba7ffda0079812721b6f4e4e109e2f0c5e8cc3d1273a060df6f7d9f339'
+
+- name: get list of files with sha384 checksum
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    patterns: test.ps1
+    checksum_algorithm: sha384
+  register: actual_sha384_checksum
+
+- name: assert sha384 checksum value
+  assert:
+    that:
+    - actual_sha384_checksum.files[0].checksum == 'aed515eb216b9c7009ae8c4680f46c1e22004528b231aa0482a8587543bca47d3504e9f77e884eb2d11b2f9f5dc01651'
+
+- name: get list of files with sha512 checksum
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    patterns: test.ps1
+    checksum_algorithm: sha512
+  register: actual_sha512_checksum
+
+- name: assert sha512 checksum value
+  assert:
+    that:
+    - actual_sha512_checksum.files[0].checksum == '05abf64a68c4731699c23b4fc6894a36646fce525f3c96f9cf743b5d0c3bfd933dad0e95e449e3afe1f74d534d69a53b8f46cf835763dd42915813c897b02b87'
+
+- name: get list of files without checksum
+  win_find:
+    paths: "{{win_find_dir}}\\single"
+    patterns: test.ps1
+    get_checksum: False
+  register: actual_no_checksum
+
+- name: assert no checksum is returned
+  assert:
+    that:
+    - actual_no_checksum.files[0].checksum is undefined
+
+# https://github.com/ansible/ansible/issues/26158
+- name: get list of files in an empty nested directory
+  win_find:
+    paths: '{{win_find_dir}}\emptynested'
+  register: actual_empty_nested
+
+- name: assert get list of files in an empty nested directory
+  assert:
+    that:
+    - actual_empty_nested.matched == 0
+
+- name: create new folders for security tests
+  win_file:
+    path: '{{win_find_dir}}\{{item}}'
+    state: directory
+  with_items:
+  - secure-tests\secure\internal-folder
+  - secure-tests\open\internal-folder
+
+- name: create random password for test user
+  set_fact:
+    test_win_find_password: password123! + {{ lookup('password', '/dev/null chars=ascii_letters,digits length=8') }}
+
+- name: create test user who does not have access to secure folder
+  win_user:
+    name: '{{test_win_find_username}}'
+    password: '{{test_win_find_password}}'
+    state: present
+    groups:
+    - Users
+
+- name: change owner of secure folder
+  win_owner:
+    path: '{{win_find_dir}}\secure-tests\secure'
+    user: BUILTIN\Administrators
+    recurse: yes
+
+- name: set explicit inheritance of secure folder for the Administrators accounts
+  win_acl:
+    user: BUILTIN\Administrators
+    path: '{{win_find_dir}}\secure-tests\secure'
+    rights: FullControl
+    type: allow
+    state: present
+    inherit: None
+
+- name: remove inheritance on the secure folder
+  win_acl_inheritance:
+    path: '{{win_find_dir}}\secure-tests\secure'
+    reorganize: no
+    state: absent
+
+- name: run win_find with under-privileged account
+  win_find:
+    paths: '{{win_find_dir}}\secure-tests'
+    recurse: yes
+    file_type: directory
+  register: secure_result
+  become: yes
+  become_method: runas
+  become_user: '{{test_win_find_username}}'
+  vars:
+    ansible_become_password: '{{test_win_find_password}}'
+
+- name: assert win_find only examined 2 files with under-privileged account
+  assert:
+    that:
+    - secure_result.examined == 2
+    - secure_result.matched == 2
+    - secure_result.files[0].path == win_find_dir + "\secure-tests\open"
+    - secure_result.files[1].path == win_find_dir + "\secure-tests\open\internal-folder"
diff -Nru ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_set_attr.ps1 ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_set_attr.ps1
--- ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_set_attr.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_set_attr.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -20,7 +20,7 @@
 
 $data = Get-Attr $params "data" "pong";
 
-$result = New-Object psobject @{
+$result = @{
     changed = $false
     ping = "pong"
 };
diff -Nru ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_strict_mode_error.ps1 ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_strict_mode_error.ps1
--- ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_strict_mode_error.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_strict_mode_error.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -22,7 +22,7 @@
 
 $data = Get-Attr $params "data" "pong";
 
-$result = New-Object psobject @{
+$result = @{
     changed = $false
     ping = $data
 };
diff -Nru ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_syntax_error.ps1 ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_syntax_error.ps1
--- ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_syntax_error.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_syntax_error.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -22,7 +22,7 @@
 
 $data = Get-Attr $params "data" "pong";
 
-$result = New-Object psobject @{
+$result = @{
     changed = $false
     ping = $data
 };
diff -Nru ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_throw.ps1 ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_throw.ps1
--- ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_throw.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_throw.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -22,7 +22,7 @@
 
 $data = Get-Attr $params "data" "pong";
 
-$result = New-Object psobject @{
+$result = @{
     changed = $false
     ping = $data
 };
diff -Nru ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_throw_string.ps1 ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_throw_string.ps1
--- ansible-2.4.1.0/test/integration/targets/win_ping/library/win_ping_throw_string.ps1	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_ping/library/win_ping_throw_string.ps1	2017-11-29 21:10:32.000000000 +0000
@@ -22,7 +22,7 @@
 
 $data = Get-Attr $params "data" "pong";
 
-$result = New-Object psobject @{
+$result = @{
     changed = $false
     ping = $data
 };
diff -Nru "/tmp/tmpRrz2ND/TSMWIOz7hz/ansible-2.4.1.0/test/integration/targets/win_script/files/space path/test_script.ps1" "/tmp/tmpRrz2ND/8Zz4Y1n_4n/ansible-2.4.2.0/test/integration/targets/win_script/files/space path/test_script.ps1"
--- "/tmp/tmpRrz2ND/TSMWIOz7hz/ansible-2.4.1.0/test/integration/targets/win_script/files/space path/test_script.ps1"	1970-01-01 00:00:00.000000000 +0000
+++ "/tmp/tmpRrz2ND/8Zz4Y1n_4n/ansible-2.4.2.0/test/integration/targets/win_script/files/space path/test_script.ps1"	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1 @@
+Write-Host "Ansible supports spaces in the path to the script."
diff -Nru ansible-2.4.1.0/test/integration/targets/win_script/tasks/main.yml ansible-2.4.2.0/test/integration/targets/win_script/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/win_script/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_script/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -35,8 +35,8 @@
       - "test_script_result.stdout"
       - "'Woohoo' in test_script_result.stdout"
       - "not test_script_result.stderr"
-      - "not test_script_result|failed"
-      - "test_script_result|changed"
+      - "not test_script_result | failed"
+      - "test_script_result | changed"
 
 - name: run test script that takes arguments including a unicode char
   script: test_script_with_args.ps1 /this /that /Ӧther
@@ -51,8 +51,8 @@
       - "test_script_with_args_result.stdout_lines[1] == '/that'"
       - "test_script_with_args_result.stdout_lines[2] == '/Ӧther'"
       - "not test_script_with_args_result.stderr"
-      - "not test_script_with_args_result|failed"
-      - "test_script_with_args_result|changed"
+      - "not test_script_with_args_result | failed"
+      - "test_script_with_args_result | changed"
 
 - name: run test script that takes parameters passed via splatting
   script: test_script_with_splatting.ps1 @{ This = 'this'; That = '{{ test_win_script_value }}'; Other = 'other'}
@@ -67,8 +67,8 @@
       - "test_script_with_splatting_result.stdout_lines[1] == test_win_script_value"
       - "test_script_with_splatting_result.stdout_lines[2] == 'other'"
       - "not test_script_with_splatting_result.stderr"
-      - "not test_script_with_splatting_result|failed"
-      - "test_script_with_splatting_result|changed"
+      - "not test_script_with_splatting_result | failed"
+      - "test_script_with_splatting_result | changed"
 
 - name: run test script that takes splatted parameters from a variable
   script: test_script_with_splatting.ps1 {{ test_win_script_splat }}
@@ -83,8 +83,8 @@
       - "test_script_with_splatting2_result.stdout_lines[1] == 'THAT'"
       - "test_script_with_splatting2_result.stdout_lines[2] == 'OTHER'"
       - "not test_script_with_splatting2_result.stderr"
-      - "not test_script_with_splatting2_result|failed"
-      - "test_script_with_splatting2_result|changed"
+      - "not test_script_with_splatting2_result | failed"
+      - "test_script_with_splatting2_result | changed"
 
 - name: run test script that has errors
   script: test_script_with_errors.ps1
@@ -97,15 +97,17 @@
       - "test_script_with_errors_result.rc != 0"
       - "not test_script_with_errors_result.stdout"
       - "test_script_with_errors_result.stderr"
-      - "test_script_with_errors_result|failed"
-      - "test_script_with_errors_result|changed"
+      - "test_script_with_errors_result | failed"
+      - "test_script_with_errors_result | changed"
 
 - name: cleanup test file if it exists
-  raw: Remove-Item "{{test_win_script_filename}}" -Force
+  raw: Remove-Item "{{ test_win_script_filename }}" -Force
   ignore_errors: true
 
 - name: run test script that creates a file
-  script: test_script_creates_file.ps1 "{{test_win_script_filename}}" creates="{{test_win_script_filename}}"
+  script: test_script_creates_file.ps1 {{ test_win_script_filename }}
+  args:
+    creates: "{{ test_win_script_filename }}"
   register: test_script_creates_file_result
 
 - name: check that script ran and indicated a change
@@ -114,22 +116,26 @@
       - "test_script_creates_file_result.rc == 0"
       - "not test_script_creates_file_result.stdout"
       - "not test_script_creates_file_result.stderr"
-      - "not test_script_creates_file_result|failed"
-      - "test_script_creates_file_result|changed"
+      - "not test_script_creates_file_result | failed"
+      - "test_script_creates_file_result | changed"
 
 - name: run test script that creates a file again
-  script: test_script_creates_file.ps1 "{{test_win_script_filename}}" creates="{{test_win_script_filename}}"
+  script: test_script_creates_file.ps1 {{ test_win_script_filename }}
+  args:
+    creates: "{{ test_win_script_filename }}"
   register: test_script_creates_file_again_result
 
 - name: check that the script did not run since the remote file exists
   assert:
     that:
-      - "not test_script_creates_file_again_result|failed"
-      - "not test_script_creates_file_again_result|changed"
-      - "test_script_creates_file_again_result|skipped"
+      - "not test_script_creates_file_again_result | failed"
+      - "not test_script_creates_file_again_result | changed"
+      - "test_script_creates_file_again_result | skipped"
 
 - name: run test script that removes a file
-  script: test_script_removes_file.ps1 "{{test_win_script_filename}}" removes="{{test_win_script_filename}}"
+  script: test_script_removes_file.ps1 {{ test_win_script_filename }}
+  args:
+    removes: "{{ test_win_script_filename }}"
   register: test_script_removes_file_result
 
 - name: check that the script ran since the remote file exists
@@ -138,19 +144,21 @@
       - "test_script_removes_file_result.rc == 0"
       - "not test_script_removes_file_result.stdout"
       - "not test_script_removes_file_result.stderr"
-      - "not test_script_removes_file_result|failed"
-      - "test_script_removes_file_result|changed"
+      - "not test_script_removes_file_result | failed"
+      - "test_script_removes_file_result | changed"
 
 - name: run test script that removes a file again
-  script: test_script_removes_file.ps1 "{{test_win_script_filename}}" removes="{{test_win_script_filename}}"
+  script: test_script_removes_file.ps1 {{ test_win_script_filename }}
+  args:
+    removes: "{{ test_win_script_filename }}"
   register: test_script_removes_file_again_result
 
 - name: check that the script did not run since the remote file does not exist
   assert:
     that:
-      - "not test_script_removes_file_again_result|failed"
-      - "not test_script_removes_file_again_result|changed"
-      - "test_script_removes_file_again_result|skipped"
+      - "not test_script_removes_file_again_result | failed"
+      - "not test_script_removes_file_again_result | changed"
+      - "test_script_removes_file_again_result | skipped"
 
 # TODO: these tests fail on 2008 (not even R2) with no output. It's related to the default codepage being UTF8- if we force it back to 437, it works fine.
 # Need to figure out a sane place to do that under the new exec wrapper.
@@ -165,8 +173,8 @@
 #      - "test_batch_result.stdout"
 #      - "'batch' in test_batch_result.stdout"
 #      - "not test_batch_result.stderr"
-#      - "not test_batch_result|failed"
-#      - "test_batch_result|changed"
+#      - "not test_batch_result | failed"
+#      - "test_batch_result | changed"
 
 
 #- name: run simple batch file with .cmd extension
@@ -180,8 +188,8 @@
 #      - "test_cmd_result.stdout"
 #      - "'cmd extension' in test_cmd_result.stdout"
 #      - "not test_cmd_result.stderr"
-#      - "not test_cmd_result|failed"
-#      - "test_cmd_result|changed"
+#      - "not test_cmd_result | failed"
+#      - "test_cmd_result | changed"
 
 - name: run test script that takes a boolean parameter
   script: test_script_bool.ps1 $true
@@ -205,4 +213,47 @@
 #    that:
 #    - test_script_env_result | succeeded
 #    - test_script_env_result.stdout_lines[0] == 'task'
-#
\ No newline at end of file
+#
+
+
+# check mode
+- name: Run test script that creates a file in check mode
+  script: test_script_creates_file.ps1 {{ test_win_script_filename }}
+  args:
+    creates: "{{ test_win_script_filename }}"
+  check_mode: yes
+  register: test_script_creates_file_check_mode
+
+- name: Get state of file created by script
+  win_stat:
+    path: "{{ test_win_script_filename }}"
+  register: create_file_stat
+
+- name: Assert that a change was reported but the script did not make changes
+  assert:
+    that:
+      - test_script_creates_file_check_mode | changed
+      - not create_file_stat.stat.exists
+
+- name: Run test script that creates a file
+  script: test_script_creates_file.ps1 {{ test_win_script_filename }}
+  args:
+    creates: "{{ test_win_script_filename }}"
+
+- name: Run test script that removes a file in check mode
+  script: test_script_removes_file.ps1 {{ test_win_script_filename }}
+  args:
+    removes: "{{ test_win_script_filename }}"
+  check_mode: yes
+  register: test_script_removes_file_check_mode
+
+- name: Get state of file removed by script
+  win_stat:
+    path: "{{ test_win_script_filename }}"
+  register: remove_file_stat
+
+- name: Assert that a change was reported but the script did not make changes
+  assert:
+    that:
+      - test_script_removes_file_check_mode | changed
+      - remove_file_stat.stat.exists
diff -Nru ansible-2.4.1.0/test/integration/targets/win_service/tasks/main.yml ansible-2.4.2.0/test/integration/targets/win_service/tasks/main.yml
--- ansible-2.4.1.0/test/integration/targets/win_service/tasks/main.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_service/tasks/main.yml	2017-11-29 21:10:32.000000000 +0000
@@ -51,3 +51,9 @@
     - '{{test_win_service_name}}'
     - TestServiceParent2
     - TestServiceDependency
+
+  - name: remove test environment variable
+    win_environment:
+      name: TEST_SERVICE_PATH
+      level: machine
+      state: absent
diff -Nru ansible-2.4.1.0/test/integration/targets/win_service/tasks/tests.yml ansible-2.4.2.0/test/integration/targets/win_service/tasks/tests.yml
--- ansible-2.4.1.0/test/integration/targets/win_service/tasks/tests.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/win_service/tasks/tests.yml	2017-11-29 21:10:32.000000000 +0000
@@ -610,6 +610,37 @@
     - not win_service_path_again|changed
     - win_service_path_again.path == 'C:\\temp\\test.exe'
 
+- name: create test environment variable
+  win_environment:
+    name: TEST_SERVICE_PATH
+    value: C:\temp
+    level: machine
+    state: present
+
+- name: set service path with quotes and env var
+  win_service:
+    name: "{{test_win_service_name}}"
+    path: '"%TEST_SERVICE_PATH%\test.exe"'
+  register: win_service_env_quote_path
+
+- name: check that the quoted service path has been changed
+  assert:
+    that:
+    - win_service_env_quote_path|changed
+    - win_service_env_quote_path.path == '"C:\\temp\\test.exe"'
+
+- name: set service path with quotes and env var again
+  win_service:
+    name: "{{test_win_service_name}}"
+    path: '"%TEST_SERVICE_PATH%\test.exe"'
+  register: win_service_env_quote_path_again
+
+- name: check that the quoted service path has been changed again
+  assert:
+    that:
+    - not win_service_env_quote_path_again|changed
+    - win_service_env_quote_path_again.path == '"C:\\temp\\test.exe"'
+
 - name: revert original service path back to normal
   win_service:
     name: "{{test_win_service_name}}"
diff -Nru ansible-2.4.1.0/test/integration/targets/zypper/aliases ansible-2.4.2.0/test/integration/targets/zypper/aliases
--- ansible-2.4.1.0/test/integration/targets/zypper/aliases	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/zypper/aliases	2017-11-29 21:10:32.000000000 +0000
@@ -1,4 +1,5 @@
 destructive
+posix/ci/group1
 skip/freebsd
 skip/osx
 skip/rhel
diff -Nru ansible-2.4.1.0/test/integration/targets/zypper/tasks/zypper.yml ansible-2.4.2.0/test/integration/targets/zypper/tasks/zypper.yml
--- ansible-2.4.1.0/test/integration/targets/zypper/tasks/zypper.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/zypper/tasks/zypper.yml	2017-11-29 21:10:32.000000000 +0000
@@ -189,6 +189,7 @@
 - name: install empty rpm
   zypper:
     name: "{{ output_dir | expanduser }}/zypper2/rpm-build/noarch/empty-1-0.noarch.rpm"
+    disable_gpg_check: yes
   register: zypper_result
 
 - name: check empty with rpm
@@ -285,7 +286,7 @@
       - zypper_patch.msg.startswith('Can not remove patches.')
 
 - name: try rm URL
-  zypper: name=http://download.opensuse.org/repositories/openSUSE:/Leap:/42.1/standard/x86_64/hello-2.9-6.2.x86_64.rpm state=absent
+  zypper: name=http://download.opensuse.org/repositories/openSUSE:/Leap:/{{ ansible_distribution_version }}/standard/x86_64/hello-2.9-6.2.x86_64.rpm state=absent
   ignore_errors: yes
   register: zypper_rm
 - assert:
@@ -293,53 +294,6 @@
       - zypper_rm|failed
       - zypper_rm.msg.startswith('Can not remove via URL.')
 
-# use of version specific (42.1) data in the following
-- block:
-  # test for #1627
-  - name: in existing patch
-    zypper: name=openSUSE-2016-128 type=patch state=present
-  - name: in existing patch again
-    zypper: name=openSUSE-2016-128 type=patch state=present
-    register: zypper_patch
-  - assert:
-      that: not zypper_patch.changed
-
-  - name: in non-existing patch
-    zypper: name=openSUSE-1800-1 type=patch state=present
-    ignore_errors: yes
-    register: zypper_patch
-  - assert:
-      that: zypper_patch|failed
-
-  - name: remove pattern update_test
-    zypper: name=update_test type=pattern state=absent
-  - name: install pattern update_test
-    zypper: name=update_test type=pattern state=present
-    register: zypper_install_pattern1
-  - name: install pattern update_test again
-    zypper: name=update_test type=pattern state=present
-    register: zypper_install_pattern2
-  - assert:
-      that:
-        - zypper_install_pattern1|changed
-        - not zypper_install_pattern2|changed
-
-  - name: remove hello
-    zypper: name=hello state=absent
-  - name: install via URL
-    zypper: state=present name=http://download.opensuse.org/repositories/openSUSE:/Leap:/42.1/standard/x86_64/hello-2.9-6.2.x86_64.rpm
-    register: zypperin1
-  - name: test install
-    zypper: name=hello state=present
-    register: zypperin2
-  - assert:
-      that:
-        - zypperin1|success
-        - zypperin1|changed
-        - not zypperin2|changed
-  when: ansible_distribution == 'openSUSE Leap' and ansible_distribution_version == '42.1'
-
-
 # check for https://github.com/ansible/ansible/issues/20139
 - name: run updatecache
   zypper:
diff -Nru ansible-2.4.1.0/test/integration/targets/zypper_repository/aliases ansible-2.4.2.0/test/integration/targets/zypper_repository/aliases
--- ansible-2.4.1.0/test/integration/targets/zypper_repository/aliases	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/zypper_repository/aliases	2017-11-29 21:10:32.000000000 +0000
@@ -1,4 +1,5 @@
 destructive
+posix/ci/group1
 skip/freebsd
 skip/osx
 skip/rhel
diff -Nru ansible-2.4.1.0/test/integration/targets/zypper_repository/tasks/zypper_repository.yml ansible-2.4.2.0/test/integration/targets/zypper_repository/tasks/zypper_repository.yml
--- ansible-2.4.1.0/test/integration/targets/zypper_repository/tasks/zypper_repository.yml	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/integration/targets/zypper_repository/tasks/zypper_repository.yml	2017-11-29 21:10:32.000000000 +0000
@@ -39,7 +39,7 @@
   zypper_repository:
     name: test
     state: present
-    repo: http://download.videolan.org/pub/vlc/SuSE/Leap_42.1/
+    repo: http://download.videolan.org/pub/vlc/SuSE/Leap_{{ ansible_distribution_version }}/
   register: zypper_result
 
 - name: Verify change on URL only change
@@ -57,7 +57,7 @@
     name: testrefresh
     refresh: no
     state: present
-    repo: http://download.opensuse.org/distribution/leap/42.1/repo/oss/
+    repo: http://download.opensuse.org/distribution/leap/{{ ansible_distribution_version }}/repo/oss/
 
 - name: check refreshoption
   command: zypper -x lr testrefresh
@@ -72,7 +72,7 @@
     name: testprio
     priority: 55
     state: present
-    repo: http://download.opensuse.org/distribution/leap/42.1/repo/oss/
+    repo: http://download.opensuse.org/distribution/leap/{{ ansible_distribution_version }}/repo/oss/
 
 - name: check refreshoption
   command: zypper -x lr testprio
@@ -86,7 +86,7 @@
   zypper_repository:
     name: "{{item}}"
     state: present
-    repo: http://download.opensuse.org/distribution/leap/42.1/repo/oss/
+    repo: http://download.opensuse.org/distribution/leap/{{ ansible_distribution_version }}/repo/oss/
   with_items:
     - oss1
     - oss2
@@ -105,14 +105,14 @@
       - "zypper_result1.rc == 6"
       - "'not found' in zypper_result1.stderr"
       - "zypper_result2.rc == 0"
-      - "'http://download.opensuse.org/distribution/leap/42.1/repo/oss/' in zypper_result2.stdout"
+      - "'http://download.opensuse.org/distribution/leap/{{ ansible_distribution_version }}/repo/oss/' in zypper_result2.stdout"
 
 
 - name: reset oss repo (to not break zypper later)
   zypper_repository:
     name: OSS
     state: present
-    repo: http://download.opensuse.org/distribution/leap/42.1/repo/oss/
+    repo: http://download.opensuse.org/distribution/leap/{{ ansible_distribution_version }}/repo/oss/
     priority: 99
     refresh: yes
 
@@ -122,8 +122,8 @@
     state: present
     repo: "{{ item }}"
   with_items:
-    - http://download.opensuse.org/repositories/science/openSUSE_Leap_42.1/
-    - http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_42.1/
+    - http://download.opensuse.org/repositories/science/openSUSE_Leap_{{ ansible_distribution_version }}/
+    - http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_{{ ansible_distribution_version }}/
 
 - name: check repo is updated by name
   command: zypper lr samename
@@ -136,7 +136,7 @@
 
 - name: remove last added repos (by URL to test that)
   zypper_repository:
-    repo: http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_42.1/
+    repo: http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_Leap_{{ ansible_distribution_version }}/
     state: absent
 
 - name: ensure zypper ref still works
diff -Nru ansible-2.4.1.0/test/runner/ansible-test ansible-2.4.2.0/test/runner/ansible-test
--- ansible-2.4.1.0/test/runner/ansible-test	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/ansible-test	2017-11-29 21:10:32.000000000 +0000
@@ -12,6 +12,8 @@
     ApplicationError,
     display,
     raw_command,
+    find_pip,
+    get_docker_completion,
 )
 
 from lib.delegation import (
@@ -112,7 +114,7 @@
     except ImportError:
         if '--requirements' not in sys.argv:
             raise
-        raw_command(generate_pip_install('ansible-test'))
+        raw_command(generate_pip_install(find_pip(), 'ansible-test'))
         import argparse
 
     try:
@@ -255,6 +257,8 @@
                                      targets=walk_network_integration_targets,
                                      config=NetworkIntegrationConfig)
 
+    add_extra_docker_options(network_integration, integration=False)
+
     network_integration.add_argument('--platform',
                                      metavar='PLATFORM',
                                      action='append',
@@ -272,6 +276,8 @@
                                      targets=walk_windows_integration_targets,
                                      config=WindowsIntegrationConfig)
 
+    add_extra_docker_options(windows_integration, integration=False)
+
     windows_integration.add_argument('--windows',
                                      metavar='VERSION',
                                      action='append',
@@ -578,6 +584,10 @@
                         dest='docker_pull',
                         help='do not explicitly pull the latest docker images')
 
+    docker.add_argument('--docker-keep-git',
+                        action='store_true',
+                        help='transfer git related files into the docker container')
+
     if not integration:
         return
 
@@ -622,8 +632,7 @@
     """
     del parsed_args
 
-    with open('test/runner/completion/docker.txt', 'r') as completion_fd:
-        images = completion_fd.read().splitlines()
+    images = sorted(get_docker_completion().keys())
 
     return [i for i in images if i.startswith(prefix)]
 
diff -Nru ansible-2.4.1.0/test/runner/completion/docker.txt ansible-2.4.2.0/test/runner/completion/docker.txt
--- ansible-2.4.1.0/test/runner/completion/docker.txt	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/completion/docker.txt	2017-11-29 21:10:32.000000000 +0000
@@ -1,9 +1,10 @@
-centos6
-centos7
-fedora24
-fedora25
-opensuse42.2
-opensuse42.3
-ubuntu1404
-ubuntu1604
-ubuntu1604py3
+centos6@sha256:41eb4b870ce400202945ccf572d45bf5f2f5ebb50e9dee244de73b9d0278db30
+centos7@sha256:bd571611112cccefdaa951ea640177cbb77c8ee011f958d2562781d90594ea9c
+default@sha256:424161033bf1342bc463c27c5fad182c171aa3bc17b3c1fe7aac44623cc8d304
+fedora24@sha256:7b642c5d25b779a3a605fb8f70d9d92972f2004a5266fe364264809899fb1117
+fedora25@sha256:828c71d87f1636f4d09916b8e2d87fc9a615d361a9afed22e8843ffb3d2729d2
+opensuse42.2@sha256:3c59cd694fe69860d299a10afaa84f4e0b3db0c4139232431e9801e1a0775b0a
+opensuse42.3@sha256:d62cc5f0de0ffddbd32c73271290a4593613bd94fa09b615ac0c025a10bdbe3c
+ubuntu1404@sha256:ba27d23e815a4c3fb361001aea2ef70241d66f08bdf962cf5717037e882ff78a
+ubuntu1604@sha256:ff3898ac817a10ec7129f6483721a717ed0d98c6ba42c27be1472d73908568da
+ubuntu1604py3@sha256:f0b7883eb3f17ee7cb3a77f4aeea0d743101e103f93a76f4f5120aed9c44c0bc
diff -Nru ansible-2.4.1.0/test/runner/completion/network.txt ansible-2.4.2.0/test/runner/completion/network.txt
--- ansible-2.4.1.0/test/runner/completion/network.txt	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/completion/network.txt	2017-11-29 21:10:32.000000000 +0000
@@ -1,4 +1,4 @@
 ios/csr1000v
 junos/vmx
 junos/vsrx
-vyos/1.1.0
+vyos/1.1.8
diff -Nru ansible-2.4.1.0/test/runner/docker/deadsnakes.list ansible-2.4.2.0/test/runner/docker/deadsnakes.list
--- ansible-2.4.1.0/test/runner/docker/deadsnakes.list	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/runner/docker/deadsnakes.list	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main
+deb-src http://ppa.launchpad.net/deadsnakes/ppa/ubuntu xenial main
diff -Nru ansible-2.4.1.0/test/runner/docker/requirements.sh ansible-2.4.2.0/test/runner/docker/requirements.sh
--- ansible-2.4.1.0/test/runner/docker/requirements.sh	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/runner/docker/requirements.sh	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,70 @@
+#!/bin/bash -eu
+
+python_versions=(
+    2.6
+    2.7
+    3.5
+    3.6
+)
+
+requirements=()
+
+for requirement in *.txt; do
+    if [ "${requirement}" != "constraints.txt" ]; then
+        requirements+=("${requirement}")
+    fi
+done
+
+for python_version in "${python_versions[@]}"; do
+    version_requirements=()
+
+    for requirement in "${requirements[@]}"; do
+        case "${python_version}" in
+            "2.6")
+                case "${requirement}" in
+                    "integration.cloud.azure.txt") continue ;;
+                esac
+        esac
+
+        version_requirements+=("${requirement}")
+    done
+
+    echo "==> Installing pip for python ${python_version} ..."
+
+    set -x
+    "python${python_version}" /tmp/get-pip.py -c constraints.txt
+    set +x
+
+    echo "==> Installing requirements for python ${python_version} ..."
+
+    for requirement in "${version_requirements[@]}"; do
+        set -x
+        "pip${python_version}" install --disable-pip-version-check -c constraints.txt -r "${requirement}"
+        set +x
+    done
+
+    echo "==> Checking for requirements conflicts for ${python_version} ..."
+
+    after=$("pip${python_version}" list)
+
+    for requirement in "${version_requirements[@]}"; do
+        before="${after}"
+
+        set -x
+        "pip${python_version}" install --disable-pip-version-check -c constraints.txt -r "${requirement}"
+        set +x
+
+        after=$("pip${python_version}" list)
+
+        if [ "${before}" != "${after}" ]; then
+            echo "==> Conflicts detected in requirements for python ${python_version}: ${requirement}"
+            echo ">>> Before"
+            echo "${before}"
+            echo ">>> After"
+            echo "${after}"
+            exit 1
+        fi
+    done
+
+    echo "==> Finished with requirements for python ${python_version}."
+done
diff -Nru ansible-2.4.1.0/test/runner/Dockerfile ansible-2.4.2.0/test/runner/Dockerfile
--- ansible-2.4.1.0/test/runner/Dockerfile	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/runner/Dockerfile	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,43 @@
+FROM ubuntu:16.04
+
+COPY docker/deadsnakes.list /etc/apt/sources.list.d/deadsnakes.list
+
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F23C5A6CF475977595C89F51BA6932366A755776
+
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    ca-certificates \
+    curl \
+    gcc \
+    git \
+    libffi-dev \
+    libxml2-dev \
+    libxslt1-dev \
+    locales \
+    make \
+    openssh-client \
+    openssl \
+    python2.6-dev \
+    python2.7-dev \
+    python3.5-dev \
+    python3.6-dev \
+    shellcheck \
+    && \
+    apt-get clean
+
+RUN rm /etc/apt/apt.conf.d/docker-clean
+RUN locale-gen en_US.UTF-8
+VOLUME /sys/fs/cgroup /run/lock /run /tmp
+
+ADD https://bootstrap.pypa.io/get-pip.py /tmp/get-pip.py
+
+COPY requirements/*.txt /tmp/requirements/
+COPY docker/requirements.sh /tmp/
+RUN cd /tmp/requirements && /tmp/requirements.sh
+
+RUN ln -s python2.7 /usr/bin/python2
+RUN ln -s python3.6 /usr/bin/python3
+RUN ln -s python3   /usr/bin/python
+
+ENV container=docker
+CMD ["/sbin/init"]
diff -Nru ansible-2.4.1.0/test/runner/.dockerignore ansible-2.4.2.0/test/runner/.dockerignore
--- ansible-2.4.1.0/test/runner/.dockerignore	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/runner/.dockerignore	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,3 @@
+*
+!docker
+!requirements
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/asa.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/asa.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/asa.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/asa.py	2017-11-29 21:10:31.000000000 +0000
@@ -33,7 +33,7 @@
 _DEVICE_CONFIGS = {}
 _CONNECTION = None
 
-asa_argument_spec = {
+asa_provider_spec = {
     'host': dict(),
     'port': dict(type='int'),
     'username': dict(fallback=(env_fallback, ['ANSIBLE_NET_USERNAME'])),
@@ -42,11 +42,15 @@
     'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
     'auth_pass': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS']), no_log=True),
     'timeout': dict(type='int'),
-    'provider': dict(type='dict'),
     'context': dict(),
     'passwords': dict()
 }
 
+asa_argument_spec = {
+    'provider': dict(type='dict', options=asa_provider_spec),
+}
+asa_argument_spec.update(asa_provider_spec)
+
 command_spec = {
     'command': dict(key=True),
     'prompt': dict(),
@@ -59,17 +63,10 @@
 
 
 def check_args(module):
-    provider = module.params['provider'] or {}
-
     for key in asa_argument_spec:
         if key not in ['context', 'passwords', 'provider', 'authorize'] and module.params[key]:
             module.warn('argument %s has been deprecated and will be removed in a future version' % key)
 
-    if provider:
-        for param in ('auth_pass', 'password'):
-            if provider.get(param):
-                module.no_log_values.update(return_values(provider[param]))
-
 
 def get_connection(module):
     global _CONNECTION
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/azure_rm_common.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/azure_rm_common.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/azure_rm_common.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/azure_rm_common.py	2017-11-29 21:10:31.000000000 +0000
@@ -31,6 +31,10 @@
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six.moves import configparser
 import ansible.module_utils.six.moves.urllib.parse as urlparse
+try:
+    from ansible.release import __version__ as ANSIBLE_VERSION
+except ImportError:
+    ANSIBLE_VERSION = 'unknown'
 
 AZURE_COMMON_ARGS = dict(
     cli_default_profile=dict(type='bool'),
@@ -66,7 +70,8 @@
     ('log_mode', 'file', ['log_path'])
 ]
 
-ANSIBLE_USER_AGENT = 'Ansible-Deploy'
+ANSIBLE_USER_AGENT = 'Ansible/{0}'.format(ANSIBLE_VERSION)
+CLOUDSHELL_USER_AGENT_KEY = 'AZURE_HTTP_USER_AGENT'
 
 CIDR_PATTERN = re.compile("(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1"
                           "[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))")
@@ -132,20 +137,44 @@
     return result
 
 
-AZURE_EXPECTED_VERSIONS = dict(
-    storage_client_version="1.0.0",
-    compute_client_version="1.0.0",
-    network_client_version="1.0.0",
-    resource_client_version="1.1.0",
-    dns_client_version="1.0.1",
-    web_client_version="0.32.0"
-)
+AZURE_PKG_VERSIONS = {
+    StorageManagementClient.__name__: {
+        'package_name': 'storage',
+        'expected_version': '1.0.0',
+        'installed_version': storage_client_version
+    },
+    ComputeManagementClient.__name__: {
+        'package_name': 'compute',
+        'expected_version': '1.0.0',
+        'installed_version': compute_client_version
+    },
+    NetworkManagementClient.__name__: {
+        'package_name': 'network',
+        'expected_version': '1.0.0',
+        'installed_version': network_client_version
+    },
+    ResourceManagementClient.__name__: {
+        'package_name': 'resource',
+        'expected_version': '1.1.0',
+        'installed_version': resource_client_version
+    },
+    DnsManagementClient.__name__: {
+        'package_name': 'dns',
+        'expected_version': '1.0.1',
+        'installed_version': dns_client_version
+    },
+    WebSiteManagementClient.__name__: {
+        'package_name': 'web',
+        'expected_version': '0.32.0',
+        'installed_version': web_client_version
+    },
+} if HAS_AZURE else {}
+
 
 AZURE_MIN_RELEASE = '2.0.0'
 
 
 class AzureRMModuleBase(object):
-
     def __init__(self, derived_arg_spec, bypass_checks=False, no_log=False,
                  check_invalid_arguments=True, mutually_exclusive=None, required_together=None,
                  required_one_of=None, add_file_common_args=False, supports_check_mode=False,
@@ -256,12 +285,17 @@
             res = self.exec_module(**self.module.params)
             self.module.exit_json(**res)
 
-    def check_client_version(self, client_name, client_version, expected_version):
+    def check_client_version(self, client_type):
         # Ensure Azure modules are at least 2.0.0rc5.
-        if Version(client_version) < Version(expected_version):
-            self.fail("Installed {0} client version is {1}. The supported version is {2}. Try "
-                      "`pip install azure>={3} --upgrade`".format(client_name, client_version, expected_version,
-                                                                  AZURE_MIN_RELEASE))
+        package_version = AZURE_PKG_VERSIONS.get(client_type.__name__, None)
+        if package_version is not None:
+            client_name = package_version.get('package_name')
+            client_version = package_version.get('installed_version')
+            expected_version = package_version.get('expected_version')
+            if Version(client_version) < Version(expected_version):
+                self.fail("Installed {0} client version is {1}. The supported version is {2}. Try "
+                          "`pip install azure>={3} --upgrade`".format(client_name, client_version, expected_version,
+                                                                      AZURE_MIN_RELEASE))
 
     def exec_module(self, **kwargs):
         self.fail("Error: {0} failed to implement exec_module method.".format(self.__class__.__name__))
@@ -474,7 +508,7 @@
             self.log("dependencies: ")
             self.log(str(dependencies))
         serializer = Serializer(classes=dependencies)
-        return serializer.body(obj, class_name)
+        return serializer.body(obj, class_name, keep_readonly=True)
 
     def get_poller_result(self, poller, wait=5):
         '''
@@ -652,107 +686,81 @@
 
         return self.get_poller_result(poller)
 
-    def _register(self, key):
-        try:
-            # We have to perform the one-time registration here. Otherwise, we receive an error the first
-            # time we attempt to use the requested client.
-            resource_client = self.rm_client
-            resource_client.providers.register(key)
-        except Exception as exc:
-            self.log("One-time registration of {0} failed - {1}".format(key, str(exc)))
-            self.log("You might need to register {0} using an admin account".format(key))
-            self.log(("To register a provider using the Python CLI: "
-                      "https://docs.microsoft.com/azure/azure-resource-manager/"
-                      "resource-manager-common-deployment-errors#noregisteredproviderfound"))
+    def get_mgmt_svc_client(self, client_type, base_url=None, api_version=None):
+        self.log('Getting management service client {0}'.format(client_type.__name__))
+        self.check_client_version(client_type)
+        if api_version:
+            client = client_type(self.azure_credentials,
+                                 self.subscription_id,
+                                 api_version=api_version,
+                                 base_url=base_url)
+        else:
+            client = client_type(self.azure_credentials,
+                                 self.subscription_id,
+                                 base_url=base_url)
+
+        # Add user agent for Ansible
+        client.config.add_user_agent(ANSIBLE_USER_AGENT)
+        # Add user agent when running from Cloud Shell
+        if CLOUDSHELL_USER_AGENT_KEY in os.environ:
+            client.config.add_user_agent(os.environ[CLOUDSHELL_USER_AGENT_KEY])
+
+        return client
 
     @property
     def storage_client(self):
         self.log('Getting storage client...')
         if not self._storage_client:
-            self.check_client_version('storage', storage_client_version, AZURE_EXPECTED_VERSIONS['storage_client_version'])
-            self._storage_client = StorageManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-06-01'
-            )
-            self._register('Microsoft.Storage')
+            self._storage_client = self.get_mgmt_svc_client(StorageManagementClient,
+                                                            base_url=self._cloud_environment.endpoints.resource_manager,
+                                                            api_version='2017-06-01')
         return self._storage_client
 
     @property
     def network_client(self):
         self.log('Getting network client')
         if not self._network_client:
-            self.check_client_version('network', network_client_version, AZURE_EXPECTED_VERSIONS['network_client_version'])
-            self._network_client = NetworkManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-06-01'
-            )
-            self._register('Microsoft.Network')
+            self._network_client = self.get_mgmt_svc_client(NetworkManagementClient,
+                                                            base_url=self._cloud_environment.endpoints.resource_manager,
+                                                            api_version='2017-06-01')
         return self._network_client
 
     @property
     def rm_client(self):
         self.log('Getting resource manager client')
         if not self._resource_client:
-            self.check_client_version('resource', resource_client_version, AZURE_EXPECTED_VERSIONS['resource_client_version'])
-            self._resource_client = ResourceManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-05-10'
-            )
+            self._resource_client = self.get_mgmt_svc_client(ResourceManagementClient,
+                                                             base_url=self._cloud_environment.endpoints.resource_manager,
+                                                             api_version='2017-05-10')
         return self._resource_client
 
     @property
     def compute_client(self):
         self.log('Getting compute client')
         if not self._compute_client:
-            self.check_client_version('compute', compute_client_version, AZURE_EXPECTED_VERSIONS['compute_client_version'])
-            self._compute_client = ComputeManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-                api_version='2017-03-30'
-            )
-            self._register('Microsoft.Compute')
+            self._compute_client = self.get_mgmt_svc_client(ComputeManagementClient,
+                                                            base_url=self._cloud_environment.endpoints.resource_manager,
+                                                            api_version='2017-03-30')
         return self._compute_client
 
     @property
     def dns_client(self):
         self.log('Getting dns client')
         if not self._dns_client:
-            self.check_client_version('dns', dns_client_version, AZURE_EXPECTED_VERSIONS['dns_client_version'])
-            self._dns_client = DnsManagementClient(
-                self.azure_credentials,
-                self.subscription_id,
-                base_url=self._cloud_environment.endpoints.resource_manager,
-            )
-            self._register('Microsoft.Dns')
+            self._dns_client = self.get_mgmt_svc_client(DnsManagementClient,
+                                                        base_url=self._cloud_environment.endpoints.resource_manager)
         return self._dns_client
 
     @property
     def web_client(self):
         self.log('Getting web client')
         if not self._web_client:
-            self.check_client_version('web', web_client_version, AZURE_EXPECTED_VERSIONS['web_client_version'])
-            self._web_client = WebSiteManagementClient(
-                credentials=self.azure_credentials,
-                subscription_id=self.subscription_id,
-                base_url=self.base_url
-            )
-            self._register('Microsoft.Web')
+            self._web_client = self.get_mgmt_svc_client(WebSiteManagementClient, base_url=self.base_url)
         return self._web_client
 
     @property
     def containerservice_client(self):
         self.log('Getting container service client')
         if not self._containerservice_client:
-            self._containerservice_client = ContainerServiceClient(
-                self.azure_credentials,
-                self.subscription_id
-            )
-            self._register('Microsoft.ContainerService')
+            self._containerservice_client = self.get_mgmt_svc_client(ContainerServiceClient)
         return self._containerservice_client
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/basic.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/basic.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/basic.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/basic.py	2017-11-29 21:10:31.000000000 +0000
@@ -87,7 +87,7 @@
 import datetime
 from collections import deque
 from collections import Mapping, MutableMapping, Sequence, MutableSequence, Set, MutableSet
-from itertools import repeat, chain
+from itertools import chain, repeat
 
 try:
     import syslog
@@ -137,6 +137,11 @@
     except SyntaxError:
         print('\n{"msg": "SyntaxError: probably due to installed simplejson being for a different python version", "failed": true}')
         sys.exit(1)
+    else:
+        sj_version = json.__version__.split('.')
+        if sj_version < ['1', '6']:
+            # Version 1.5 released 2007-01-18 does not have the encoding parameter which we need
+            print('\n{"msg": "Error: Ansible requires the stdlib json or simplejson >= 1.6.  Neither was found!", "failed": true}')
 
 AVAILABLE_HASH_ALGORITHMS = dict()
 try:
@@ -763,15 +768,32 @@
     return ''.join(flags)
 
 
-class AnsibleFallbackNotFound(Exception):
-    pass
+def _json_encode_fallback(obj):
+    if isinstance(obj, Set):
+        return list(obj)
+    elif isinstance(obj, datetime.datetime):
+        return obj.isoformat()
+    raise TypeError("Cannot json serialize %s" % to_native(obj))
+
+
+def jsonify(data, **kwargs):
+    for encoding in ("utf-8", "latin-1"):
+        try:
+            return json.dumps(data, encoding=encoding, default=_json_encode_fallback, **kwargs)
+        # Old systems using old simplejson module does not support encoding keyword.
+        except TypeError:
+            try:
+                new_data = json_dict_bytes_to_unicode(data, encoding=encoding)
+            except UnicodeDecodeError:
+                continue
+            return json.dumps(new_data, default=_json_encode_fallback, **kwargs)
+        except UnicodeDecodeError:
+            continue
+    raise UnicodeError('Invalid unicode encoding encountered')
 
 
-class _SetEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, Set):
-            return list(obj)
-        return super(_SetEncoder, self).default(obj)
+class AnsibleFallbackNotFound(Exception):
+    pass
 
 
 class AnsibleModule(object):
@@ -801,6 +823,7 @@
         self._debug = False
         self._diff = False
         self._socket_path = None
+        self._shell = None
         self._verbosity = 0
         # May be used to set modifications to the environment for any
         # run_command invocation
@@ -811,7 +834,7 @@
         self.aliases = {}
         self._legal_inputs = ['_ansible_check_mode', '_ansible_no_log', '_ansible_debug', '_ansible_diff', '_ansible_verbosity',
                               '_ansible_selinux_special_fs', '_ansible_module_name', '_ansible_version', '_ansible_syslog_facility',
-                              '_ansible_socket']
+                              '_ansible_socket', '_ansible_shell_executable']
         self._options_context = list()
 
         if add_file_common_args:
@@ -1613,6 +1636,9 @@
             elif k == '_ansible_socket':
                 self._socket_path = v
 
+            elif k == '_ansible_shell_executable' and v:
+                self._shell = v
+
             elif check_invalid_arguments and k not in legal_inputs:
                 unsupported_parameters.add(k)
 
@@ -2197,19 +2223,10 @@
             self.fail_json(msg=to_native(e))
 
     def jsonify(self, data):
-        for encoding in ("utf-8", "latin-1"):
-            try:
-                return json.dumps(data, encoding=encoding, cls=_SetEncoder)
-            # Old systems using old simplejson module does not support encoding keyword.
-            except TypeError:
-                try:
-                    new_data = json_dict_bytes_to_unicode(data, encoding=encoding)
-                except UnicodeDecodeError:
-                    continue
-                return json.dumps(new_data, cls=_SetEncoder)
-            except UnicodeDecodeError:
-                continue
-        self.fail_json(msg='Invalid unicode encoding encountered')
+        try:
+            return jsonify(data)
+        except UnicodeError as e:
+            self.fail_json(msg=to_text(e))
 
     def from_json(self, data):
         return json.loads(data)
@@ -2602,24 +2619,37 @@
             strings on python3, use encoding=None to turn decoding to text off.
         '''
 
+        if not isinstance(args, (list, binary_type, text_type)):
+            msg = "Argument 'args' to run_command must be list or string"
+            self.fail_json(rc=257, cmd=args, msg=msg)
+
         shell = False
-        if isinstance(args, list):
-            if use_unsafe_shell:
+        if use_unsafe_shell:
+
+            # stringify args for unsafe/direct shell usage
+            if isinstance(args, list):
                 args = " ".join([shlex_quote(x) for x in args])
+
+            # not set explicitly, check if set by controller
+            if executable:
+                args = [executable, '-c', args]
+            elif self._shell not in (None, '/bin/sh'):
+                args = [self._shell, '-c', args]
+            else:
                 shell = True
-        elif isinstance(args, (binary_type, text_type)) and use_unsafe_shell:
-            shell = True
-        elif isinstance(args, (binary_type, text_type)):
-            # On python2.6 and below, shlex has problems with text type
-            # On python3, shlex needs a text type.
-            if PY2:
-                args = to_bytes(args, errors='surrogate_or_strict')
-            elif PY3:
-                args = to_text(args, errors='surrogateescape')
-            args = shlex.split(args)
         else:
-            msg = "Argument 'args' to run_command must be list or string"
-            self.fail_json(rc=257, cmd=args, msg=msg)
+            # ensure args are a list
+            if isinstance(args, (binary_type, text_type)):
+                # On python2.6 and below, shlex has problems with text type
+                # On python3, shlex needs a text type.
+                if PY2:
+                    args = to_bytes(args, errors='surrogate_or_strict')
+                elif PY3:
+                    args = to_text(args, errors='surrogateescape')
+                args = shlex.split(args)
+
+            # expand shellisms
+            args = [os.path.expanduser(os.path.expandvars(x)) for x in args if x is not None]
 
         prompt_re = None
         if prompt_regex:
@@ -2633,10 +2663,6 @@
             except re.error:
                 self.fail_json(msg="invalid prompt regular expression given to run_command")
 
-        # expand things like $HOME and ~
-        if not shell:
-            args = [os.path.expanduser(os.path.expandvars(x)) for x in args if x is not None]
-
         rc = 0
         msg = None
         st_in = None
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/eos.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/eos.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/eos.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/eos.py	2017-11-29 21:10:31.000000000 +0000
@@ -299,7 +299,7 @@
         commands = to_list(commands)
 
         if self._enable:
-            commands.insert(0, 'enable')
+            commands.insert(0, self._enable)
 
         body = self._request_builder(commands, output)
         data = self._module.jsonify(body)
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/facts/system/distribution.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/facts/system/distribution.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/facts/system/distribution.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/facts/system/distribution.py	2017-11-29 21:10:31.000000000 +0000
@@ -491,7 +491,9 @@
         darwin_facts['distribution'] = 'MacOSX'
         rc, out, err = self.module.run_command("/usr/bin/sw_vers -productVersion")
         data = out.split()[-1]
-        darwin_facts['distribution_version'] = data
+        if data:
+            darwin_facts['distribution_major_version'] = data.split('.')[0]
+            darwin_facts['distribution_version'] = data
         return darwin_facts
 
     def get_distribution_FreeBSD(self):
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/facts/system/service_mgr.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/facts/system/service_mgr.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/facts/system/service_mgr.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/facts/system/service_mgr.py	2017-11-29 21:10:31.000000000 +0000
@@ -105,22 +105,22 @@
 
         # FIXME: replace with a system->service_mgr_name map?
         # start with the easy ones
-        elif collected_facts.get('distribution', None) == 'MacOSX':
+        elif collected_facts.get('ansible_distribution', None) == 'MacOSX':
             # FIXME: find way to query executable, version matching is not ideal
             if LooseVersion(platform.mac_ver()[0]) >= LooseVersion('10.4'):
                 service_mgr_name = 'launchd'
             else:
                 service_mgr_name = 'systemstarter'
-        elif 'BSD' in collected_facts.get('system', '') or collected_facts.get('system') in ['Bitrig', 'DragonFly']:
+        elif 'BSD' in collected_facts.get('ansible_system', '') or collected_facts.get('ansible_system') in ['Bitrig', 'DragonFly']:
             # FIXME: we might want to break out to individual BSDs or 'rc'
             service_mgr_name = 'bsdinit'
-        elif collected_facts.get('system') == 'AIX':
+        elif collected_facts.get('ansible_system') == 'AIX':
             service_mgr_name = 'src'
-        elif collected_facts.get('system') == 'SunOS':
+        elif collected_facts.get('ansible_system') == 'SunOS':
             service_mgr_name = 'smf'
-        elif collected_facts.get('distribution') == 'OpenWrt':
+        elif collected_facts.get('ansible_distribution') == 'OpenWrt':
             service_mgr_name = 'openwrt_init'
-        elif collected_facts.get('system') == 'Linux':
+        elif collected_facts.get('ansible_system') == 'Linux':
             # FIXME: mv is_systemd_managed
             if self.is_systemd_managed(module=module):
                 service_mgr_name = 'systemd'
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/json_utils.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/json_utils.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/json_utils.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/json_utils.py	2017-11-29 21:10:31.000000000 +0000
@@ -23,7 +23,6 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-
 try:
     import json
 except ImportError:
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/k8s_common.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/k8s_common.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/k8s_common.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/k8s_common.py	2017-11-29 21:10:31.000000000 +0000
@@ -122,10 +122,6 @@
         :return: None
         """
 
-        if self.params.get('debug'):
-            self.helper.enable_debug(reset_logfile=False)
-            self.helper.log_argspec()
-
         resource_definition = self.params.get('resource_definition')
         if self.params.get('src'):
             resource_definition = self.load_resource_definition(self.params['src'])
@@ -225,10 +221,10 @@
                 return_attributes[self.kind] = existing.to_dict()
                 self.exit_json(**return_attributes)
             else:
-                self.helper.log('Existing:')
-                self.helper.log(json.dumps(existing.to_dict(), indent=4))
-                self.helper.log('\nDifferences:')
-                self.helper.log(json.dumps(diff, indent=4))
+                self.log('Existing:')
+                self.log(json.dumps(existing.to_str(), indent=4))
+                self.log('\nDifferences:')
+                self.log(json.dumps(diff, indent=4))
             # Differences exist between the existing obj and requested params
             if not self.check_mode:
                 try:
@@ -267,7 +263,7 @@
         """ Load the requested src path """
         result = None
         path = os.path.normpath(src)
-        self.helper.log("Reading definition from {}".format(path))
+        self.log("Reading definition from {}".format(path))
         if not os.path.exists(path):
             self.fail_json(msg="Error accessing {}. Does the file exist?".format(path))
         try:
@@ -290,7 +286,7 @@
                     parameters[key] = value
             elif isinstance(value, dict):
                 self._add_parameter(value, [key], parameters)
-        self.helper.log("Request to parameters: {}".format(json.dumps(parameters)))
+        self.log("Request to parameters: {}".format(json.dumps(parameters)))
         return parameters
 
     def _add_parameter(self, request, path, parameters):
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/known_hosts.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/known_hosts.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/known_hosts.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/known_hosts.py	2017-11-29 21:10:31.000000000 +0000
@@ -30,10 +30,7 @@
 import hmac
 import re
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+from ansible.module_utils.six.moves.urllib.parse import urlparse
 
 try:
     from hashlib import sha1
@@ -75,7 +72,7 @@
             fqdn = repo_url.split("/")[0]
     elif "://" in repo_url:
         # this should be something we can parse with urlparse
-        parts = urlparse.urlparse(repo_url)
+        parts = urlparse(repo_url)
         # parts[1] will be empty on python2.4 on ssh:// or git:// urls, so
         # ensure we actually have a parts[1] before continuing.
         if parts[1] != '':
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/nxos.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/nxos.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/nxos.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/nxos.py	2017-11-29 21:10:31.000000000 +0000
@@ -151,10 +151,16 @@
             if check_rc and rc != 0:
                 self._module.fail_json(msg=to_text(err, errors='surrogate_then_replace'))
 
-            try:
-                out = self._module.from_json(out)
-            except ValueError:
-                out = str(out).strip()
+            if not check_rc and rc != 0:
+                try:
+                    out = self._module.from_json(err)
+                except ValueError:
+                    out = to_text(err, errors='surrogate_then_replace').strip()
+            else:
+                try:
+                    out = self._module.from_json(out)
+                except ValueError:
+                    out = to_text(out, errors='surrogate_then_replace').strip()
 
             responses.append(out)
         return responses
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/urls.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/urls.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/urls.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/urls.py	2017-11-29 21:10:31.000000000 +0000
@@ -675,7 +675,7 @@
         make sure we get back a valid code from the proxy
         '''
         try:
-            (http_version, resp_code, msg) = re.match(r'(HTTP/\d\.\d) (\d\d\d) (.*)', response).groups()
+            (http_version, resp_code, msg) = re.match(br'(HTTP/\d\.\d) (\d\d\d) (.*)', response).groups()
             if int(resp_code) not in valid_codes:
                 raise Exception
         except:
@@ -698,10 +698,13 @@
         return True
 
     def _make_context(self, to_add_ca_cert_path):
-        if HAS_URLLIB3_PYOPENSSLCONTEXT:
+        if HAS_SSLCONTEXT:
+            context = create_default_context()
+        elif HAS_URLLIB3_PYOPENSSLCONTEXT:
             context = PyOpenSSLContext(PROTOCOL)
         else:
-            context = create_default_context()
+            raise NotImplementedError('Host libraries are too old to support creating an sslcontext')
+
         if to_add_ca_cert_path:
             context.load_verify_locations(to_add_ca_cert_path)
         return context
@@ -710,8 +713,11 @@
         tmp_ca_cert_path, to_add_ca_cert_path, paths_checked = self.get_ca_certs()
         https_proxy = os.environ.get('https_proxy')
         context = None
-        if HAS_SSLCONTEXT or HAS_URLLIB3_PYOPENSSLCONTEXT:
+        try:
             context = self._make_context(to_add_ca_cert_path)
+        except Exception:
+            # We'll make do with no context below
+            pass
 
         # Detect if 'no_proxy' environment variable is set and if our URL is included
         use_proxy = self.detect_no_proxy(req.get_full_url())
diff -Nru ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/vmware.py ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/vmware.py
--- ansible-2.4.1.0/test/runner/import/lib/ansible/module_utils/vmware.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/import/lib/ansible/module_utils/vmware.py	2017-11-29 21:10:31.000000000 +0000
@@ -31,6 +31,7 @@
 except ImportError:
     HAS_PYVMOMI = False
 
+from ansible.module_utils._text import to_text
 from ansible.module_utils.urls import fetch_url
 from ansible.module_utils.six import integer_types, iteritems, string_types
 
@@ -234,7 +235,11 @@
     thisobj = vobj
     while hasattr(thisobj, 'parent'):
         thisobj = thisobj.parent
-        if thisobj.name == 'Datacenters':
+        try:
+            moid = thisobj._moId
+        except AttributeError:
+            moid = None
+        if moid in ['group-d1', 'ha-folder-root']:
             break
         if isinstance(thisobj, vim.Folder):
             paths.append(thisobj.name)
@@ -403,6 +408,9 @@
         service_instance = connect.SmartConnect(host=hostname, user=username, pwd=password, sslContext=ssl_context)
     except vim.fault.InvalidLogin as e:
         module.fail_json(msg="Unable to log on to vCenter or ESXi API at %s as %s: %s" % (hostname, username, e.msg))
+    except vim.fault.NoPermission as e:
+        module.fail_json(msg="User %s does not have required permission"
+                             " to log on to vCenter or ESXi API at %s: %s" % (username, hostname, e.msg))
     except (requests.ConnectionError, ssl.SSLError) as e:
         module.fail_json(msg="Unable to connect to vCenter or ESXi API at %s on TCP/443: %s" % (hostname, e))
     except Exception as e:
@@ -593,22 +601,14 @@
         xt = type(xo)
         if xo is None:
             data[x] = None
-        elif issubclass(xt, list):
-            data[x] = []
-            for xe in xo:
-                data[x].append(serialize_spec(xe))
-        elif issubclass(xt, string_types + integer_types + (float, bool)):
-            data[x] = xo
-        elif issubclass(xt, dict):
-            data[x] = {}
-            for k, v in xo.items():
-                data[x][k] = serialize_spec(v)
         elif isinstance(xo, vim.vm.ConfigSpec):
             data[x] = serialize_spec(xo)
         elif isinstance(xo, vim.vm.RelocateSpec):
             data[x] = serialize_spec(xo)
         elif isinstance(xo, vim.vm.device.VirtualDisk):
             data[x] = serialize_spec(xo)
+        elif isinstance(xo, vim.vm.device.VirtualDeviceSpec.FileOperation):
+            data[x] = serialize_spec(xo)
         elif isinstance(xo, vim.Description):
             data[x] = {
                 'dynamicProperty': serialize_spec(xo.dynamicProperty),
@@ -617,9 +617,22 @@
                 'summary': serialize_spec(xo.summary),
             }
         elif hasattr(xo, 'name'):
-            data[x] = str(xo) + ':' + xo.name
+            data[x] = to_text(xo) + ':' + to_text(xo.name)
         elif isinstance(xo, vim.vm.ProfileSpec):
             pass
+        elif issubclass(xt, list):
+            data[x] = []
+            for xe in xo:
+                data[x].append(serialize_spec(xe))
+        elif issubclass(xt, string_types + integer_types + (float, bool)):
+            data[x] = to_text(xt)
+        elif issubclass(xt, bool):
+            data[x] = xo
+        elif issubclass(xt, dict):
+            data[to_text(x)] = {}
+            for k, v in xo.items():
+                k = to_text(k)
+                data[x][k] = serialize_spec(v)
         else:
             data[x] = str(xt)
 
diff -Nru ansible-2.4.1.0/test/runner/injector/ansible-connection ansible-2.4.2.0/test/runner/injector/ansible-connection
--- ansible-2.4.1.0/test/runner/injector/ansible-connection	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/runner/injector/ansible-connection	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,256 @@
+#!/usr/bin/env python
+"""Interpreter and code coverage injector for use with ansible-test.
+
+The injector serves two main purposes:
+
+1) Control the python interpreter used to run test tools and ansible code.
+2) Provide optional code coverage analysis of ansible code.
+
+The injector is executed one of two ways:
+
+1) On the controller via a symbolic link such as ansible or pytest.
+   This is accomplished by prepending the injector directory to the PATH by ansible-test.
+
+2) As the python interpreter when running ansible modules.
+   This is only supported when connecting to the local host.
+   Otherwise set the ANSIBLE_TEST_REMOTE_INTERPRETER environment variable.
+   It can be empty to auto-detect the python interpreter on the remote host.
+   If not empty it will be used to set ansible_python_interpreter.
+
+NOTE: Running ansible-test with the --tox option or inside a virtual environment
+      may prevent the injector from working for tests which use connection
+      types other than local, or which use become, due to lack of permissions
+      to access the interpreter for the virtual environment.
+"""
+
+from __future__ import absolute_import, print_function
+
+import errno
+import json
+import os
+import sys
+import pipes
+import logging
+import getpass
+
+logger = logging.getLogger('injector')  # pylint: disable=locally-disabled, invalid-name
+# pylint: disable=locally-disabled, invalid-name
+config = None  # type: InjectorConfig
+
+
+class InjectorConfig(object):
+    """Mandatory configuration."""
+    def __init__(self, config_path):
+        """Initialize config."""
+        with open(config_path) as config_fd:
+            _config = json.load(config_fd)
+
+        self.python_interpreter = _config['python_interpreter']
+        self.coverage_file = _config['coverage_file']
+
+        # Read from the environment instead of config since it needs to be changed by integration test scripts.
+        # It also does not need to flow from the controller to the remote. It is only used on the controller.
+        self.remote_interpreter = os.environ.get('ANSIBLE_TEST_REMOTE_INTERPRETER', None)
+
+        self.arguments = [to_text(c) for c in sys.argv]
+
+
+def to_text(value):
+    """
+    :type value: str | None
+    :rtype: str | None
+    """
+    if value is None:
+        return None
+
+    if isinstance(value, bytes):
+        return value.decode('utf-8')
+
+    return u'%s' % value
+
+
+def main():
+    """Main entry point."""
+    global config  # pylint: disable=locally-disabled, global-statement
+
+    formatter = logging.Formatter('%(asctime)s %(process)d %(levelname)s %(message)s')
+    log_name = 'ansible-test-coverage.%s.log' % getpass.getuser()
+    self_dir = os.path.dirname(os.path.abspath(__file__))
+
+    handler = logging.FileHandler(os.path.join('/tmp', log_name))
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
+    handler = logging.FileHandler(os.path.abspath(os.path.join(self_dir, '..', 'logs', log_name)))
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
+    logger.setLevel(logging.DEBUG)
+
+    try:
+        logger.debug('Self: %s', __file__)
+
+        config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'injector.json')
+
+        try:
+            config = InjectorConfig(config_path)
+        except IOError:
+            logger.exception('Error reading config: %s', config_path)
+            exit('No injector config found. Set ANSIBLE_TEST_REMOTE_INTERPRETER if the test is not connecting to the local host.')
+
+        logger.debug('Arguments: %s', ' '.join(pipes.quote(c) for c in config.arguments))
+        logger.debug('Python interpreter: %s', config.python_interpreter)
+        logger.debug('Remote interpreter: %s', config.remote_interpreter)
+        logger.debug('Coverage file: %s', config.coverage_file)
+
+        require_cwd = False
+
+        if os.path.basename(__file__) == 'injector.py':
+            if config.coverage_file:
+                args, env, require_cwd = cover()
+            else:
+                args, env = runner()
+        else:
+            args, env = injector()
+
+        logger.debug('Run command: %s', ' '.join(pipes.quote(c) for c in args))
+
+        altered_cwd = False
+
+        try:
+            cwd = os.getcwd()
+        except OSError as ex:
+            # some platforms, such as OS X, may not allow querying the working directory when using become to drop privileges
+            if ex.errno != errno.EACCES:
+                raise
+            if require_cwd:
+                # make sure the program we execute can determine the working directory if it's required
+                cwd = '/'
+                os.chdir(cwd)
+                altered_cwd = True
+            else:
+                cwd = None
+
+        logger.debug('Working directory: %s%s', cwd or '?', ' (altered)' if altered_cwd else '')
+
+        for key in sorted(env.keys()):
+            logger.debug('%s=%s', key, env[key])
+
+        os.execvpe(args[0], args, env)
+    except Exception as ex:
+        logger.fatal(ex)
+        raise
+
+
+def injector():
+    """
+    :rtype: list[str], dict[str, str]
+    """
+    command = os.path.basename(__file__)
+    executable = find_executable(command)
+
+    if config.coverage_file:
+        args, env = coverage_command()
+    else:
+        args, env = [config.python_interpreter], os.environ.copy()
+
+    args += [executable]
+
+    if command in ('ansible', 'ansible-playbook', 'ansible-pull'):
+        if config.remote_interpreter is None:
+            interpreter = os.path.join(os.path.dirname(__file__), 'injector.py')
+        elif config.remote_interpreter == '':
+            interpreter = None
+        else:
+            interpreter = config.remote_interpreter
+
+        if interpreter:
+            args += ['--extra-vars', 'ansible_python_interpreter=' + interpreter]
+
+    args += config.arguments[1:]
+
+    return args, env
+
+
+def runner():
+    """
+    :rtype: list[str], dict[str, str]
+    """
+    args, env = [config.python_interpreter], os.environ.copy()
+
+    args += config.arguments[1:]
+
+    return args, env
+
+
+def cover():
+    """
+    :rtype: list[str], dict[str, str], bool
+    """
+    if len(config.arguments) > 1:
+        executable = config.arguments[1]
+    else:
+        executable = ''
+
+    require_cwd = False
+
+    if os.path.basename(executable).startswith('ansible_module_'):
+        args, env = coverage_command()
+        # coverage requires knowing the working directory
+        require_cwd = True
+    else:
+        args, env = [config.python_interpreter], os.environ.copy()
+
+    args += config.arguments[1:]
+
+    return args, env, require_cwd
+
+
+def coverage_command():
+    """
+    :rtype: list[str], dict[str, str]
+    """
+    self_dir = os.path.dirname(os.path.abspath(__file__))
+
+    args = [
+        config.python_interpreter,
+        '-m',
+        'coverage.__main__',
+        'run',
+        '--rcfile',
+        os.path.join(self_dir, '.coveragerc'),
+    ]
+
+    env = os.environ.copy()
+    env['COVERAGE_FILE'] = config.coverage_file
+
+    return args, env
+
+
+def find_executable(executable):
+    """
+    :type executable: str
+    :rtype: str
+    """
+    self = os.path.abspath(__file__)
+    path = os.environ.get('PATH', os.defpath)
+    seen_dirs = set()
+
+    for path_dir in path.split(os.pathsep):
+        if path_dir in seen_dirs:
+            continue
+
+        seen_dirs.add(path_dir)
+        candidate = os.path.abspath(os.path.join(path_dir, executable))
+
+        if candidate == self:
+            continue
+
+        if os.path.exists(candidate) and os.access(candidate, os.F_OK | os.X_OK):
+            return candidate
+
+    raise Exception('Executable "%s" not found in path: %s' % (executable, path))
+
+
+if __name__ == '__main__':
+    main()
diff -Nru ansible-2.4.1.0/test/runner/lib/ansible_util.py ansible-2.4.2.0/test/runner/lib/ansible_util.py
--- ansible-2.4.1.0/test/runner/lib/ansible_util.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/ansible_util.py	2017-11-29 21:10:32.000000000 +0000
@@ -49,6 +49,9 @@
     env.update(ansible)
 
     if args.debug:
-        env.update(dict(ANSIBLE_DEBUG='true'))
+        env.update(dict(
+            ANSIBLE_DEBUG='true',
+            ANSIBLE_LOG_PATH=os.path.abspath('test/results/logs/debug.log'),
+        ))
 
     return env
diff -Nru ansible-2.4.1.0/test/runner/lib/classification.py ansible-2.4.2.0/test/runner/lib/classification.py
--- ansible-2.4.1.0/test/runner/lib/classification.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/classification.py	2017-11-29 21:10:32.000000000 +0000
@@ -367,6 +367,9 @@
 
             return minimal
 
+        if path.startswith('test/cache/'):
+            return minimal
+
         if path.startswith('test/compile/'):
             return {
                 'compile': 'all',
@@ -455,6 +458,9 @@
 
                 test_path = os.path.dirname(test_path)
 
+        if path.startswith('test/runner/docker/'):
+            return minimal  # not used by tests, only used to build the default container
+
         if path.startswith('test/runner/lib/cloud/'):
             cloud_target = 'cloud/%s/' % name
 
@@ -470,6 +476,32 @@
                 'sanity': 'all',  # test infrastructure, run all sanity checks
             }
 
+        if path.startswith('test/runner/requirements/'):
+            if name in (
+                    'integration',
+                    'network-integration',
+                    'windows-integration',
+            ):
+                return {
+                    name: self.integration_all_target,
+                }
+
+            if name in (
+                    'sanity',
+                    'units',
+            ):
+                return {
+                    name: 'all',
+                }
+
+            if name.startswith('integration.cloud.'):
+                cloud_target = 'cloud/%s/' % name.split('.')[2]
+
+                if cloud_target in self.integration_targets_by_alias:
+                    return {
+                        'integration': cloud_target,
+                    }
+
         if path.startswith('test/runner/'):
             return all_tests(self.args)  # test infrastructure, run all tests
 
diff -Nru ansible-2.4.1.0/test/runner/lib/config.py ansible-2.4.2.0/test/runner/lib/config.py
--- ansible-2.4.1.0/test/runner/lib/config.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/config.py	2017-11-29 21:10:32.000000000 +0000
@@ -43,6 +43,7 @@
         self.docker_privileged = args.docker_privileged if 'docker_privileged' in args else False  # type: bool
         self.docker_util = docker_qualify_image(args.docker_util if 'docker_util' in args else '')  # type: str
         self.docker_pull = args.docker_pull if 'docker_pull' in args else False  # type: bool
+        self.docker_keep_git = args.docker_keep_git if 'docker_keep_git' in args else False  # type: bool
 
         self.tox_sitepackages = args.tox_sitepackages  # type: bool
 
@@ -53,7 +54,7 @@
         self.requirements = args.requirements  # type: bool
 
         if self.python == 'default':
-            self.python = '.'.join(str(i) for i in sys.version_info[:2])
+            self.python = None
 
         self.python_version = self.python or '.'.join(str(i) for i in sys.version_info[:2])
 
diff -Nru ansible-2.4.1.0/test/runner/lib/core_ci.py ansible-2.4.2.0/test/runner/lib/core_ci.py
--- ansible-2.4.1.0/test/runner/lib/core_ci.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/core_ci.py	2017-11-29 21:10:32.000000000 +0000
@@ -8,6 +8,7 @@
 import uuid
 import errno
 import time
+import shutil
 
 from lib.http import (
     HttpClient,
@@ -35,13 +36,14 @@
 
 class AnsibleCoreCI(object):
     """Client for Ansible Core CI services."""
-    def __init__(self, args, platform, version, stage='prod', persist=True, name=None):
+    def __init__(self, args, platform, version, stage='prod', persist=True, load=True, name=None):
         """
         :type args: EnvironmentConfig
         :type platform: str
         :type version: str
         :type stage: str
         :type persist: bool
+        :type load: bool
         :type name: str
         """
         self.args = args
@@ -106,7 +108,7 @@
 
         self.path = os.path.expanduser('~/.ansible/test/instances/%s-%s' % (self.name, self.stage))
 
-        if persist and self._load():
+        if persist and load and self._load():
             try:
                 display.info('Checking existing %s/%s instance %s.' % (self.platform, self.version, self.instance_id),
                              verbosity=1)
@@ -125,7 +127,7 @@
 
                 self.instance_id = None
                 self.endpoint = None
-        else:
+        elif not persist:
             self.instance_id = None
             self.endpoint = None
             self._clear()
@@ -160,6 +162,11 @@
 
     def start(self):
         """Start instance."""
+        if self.started:
+            display.info('Skipping started %s/%s instance %s.' % (self.platform, self.version, self.instance_id),
+                         verbosity=1)
+            return
+
         if is_shippable():
             return self.start_shippable()
 
@@ -289,11 +296,6 @@
 
     def _start(self, auth):
         """Start instance."""
-        if self.started:
-            display.info('Skipping started %s/%s instance %s.' % (self.platform, self.version, self.instance_id),
-                         verbosity=1)
-            return
-
         display.info('Initializing new %s/%s instance %s.' % (self.platform, self.version, self.instance_id), verbosity=1)
 
         if self.platform == 'windows':
@@ -413,6 +415,13 @@
 
         config = json.loads(data)
 
+        return self.load(config)
+
+    def load(self, config):
+        """
+        :type config: dict[str, str]
+        :rtype: bool
+        """
         self.instance_id = config['instance_id']
         self.endpoint = config['endpoint']
         self.started = True
@@ -424,16 +433,23 @@
         if self.args.explain:
             return
 
+        config = self.save()
+
         make_dirs(os.path.dirname(self.path))
 
         with open(self.path, 'w') as instance_fd:
-            config = dict(
-                instance_id=self.instance_id,
-                endpoint=self.endpoint,
-            )
-
             instance_fd.write(json.dumps(config, indent=4, sort_keys=True))
 
+    def save(self):
+        """
+        :rtype: dict[str, str]
+        """
+        return dict(
+            platform_version='%s/%s' % (self.platform, self.version),
+            instance_id=self.instance_id,
+            endpoint=self.endpoint,
+        )
+
     @staticmethod
     def _create_http_error(response):
         """
@@ -472,20 +488,33 @@
 
 class SshKey(object):
     """Container for SSH key used to connect to remote instances."""
+    KEY_NAME = 'id_rsa'
+    PUB_NAME = 'id_rsa.pub'
+
     def __init__(self, args):
         """
         :type args: EnvironmentConfig
         """
-        tmp = os.path.expanduser('~/.ansible/test/')
+        cache_dir = 'test/cache'
+
+        self.key = os.path.join(cache_dir, self.KEY_NAME)
+        self.pub = os.path.join(cache_dir, self.PUB_NAME)
 
-        self.key = os.path.join(tmp, 'id_rsa')
-        self.pub = os.path.join(tmp, 'id_rsa.pub')
+        if not os.path.isfile(self.key) or not os.path.isfile(self.pub):
+            base_dir = os.path.expanduser('~/.ansible/test/')
+
+            key = os.path.join(base_dir, self.KEY_NAME)
+            pub = os.path.join(base_dir, self.PUB_NAME)
 
-        if not os.path.isfile(self.pub):
             if not args.explain:
-                make_dirs(tmp)
+                make_dirs(base_dir)
+
+            if not os.path.isfile(key) or not os.path.isfile(pub):
+                run_command(args, ['ssh-keygen', '-q', '-t', 'rsa', '-N', '', '-f', key])
 
-            run_command(args, ['ssh-keygen', '-q', '-t', 'rsa', '-N', '', '-f', self.key])
+            if not args.explain:
+                shutil.copy2(key, self.key)
+                shutil.copy2(pub, self.pub)
 
         if args.explain:
             self.pub_contents = None
diff -Nru ansible-2.4.1.0/test/runner/lib/delegation.py ansible-2.4.2.0/test/runner/lib/delegation.py
--- ansible-2.4.1.0/test/runner/lib/delegation.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/delegation.py	2017-11-29 21:10:32.000000000 +0000
@@ -102,10 +102,10 @@
     :type require: list[str]
     """
     if args.python:
-        versions = args.python,
+        versions = args.python_version,
 
-        if args.python not in SUPPORTED_PYTHON_VERSIONS:
-            raise ApplicationError('tox does not support Python version %s' % args.python)
+        if args.python_version not in SUPPORTED_PYTHON_VERSIONS:
+            raise ApplicationError('tox does not support Python version %s' % args.python_version)
     else:
         versions = SUPPORTED_PYTHON_VERSIONS
 
@@ -189,7 +189,12 @@
     with tempfile.NamedTemporaryFile(prefix='ansible-source-', suffix='.tgz') as local_source_fd:
         try:
             if not args.explain:
-                lib.pytar.create_tarfile(local_source_fd.name, '.', lib.pytar.ignore)
+                if args.docker_keep_git:
+                    tar_filter = lib.pytar.AllowGitTarFilter()
+                else:
+                    tar_filter = lib.pytar.DefaultTarFilter()
+
+                lib.pytar.create_tarfile(local_source_fd.name, '.', tar_filter)
 
             if util_image:
                 util_options = [
diff -Nru ansible-2.4.1.0/test/runner/lib/executor.py ansible-2.4.2.0/test/runner/lib/executor.py
--- ansible-2.4.1.0/test/runner/lib/executor.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/executor.py	2017-11-29 21:10:32.000000000 +0000
@@ -11,11 +11,7 @@
 import time
 import textwrap
 import functools
-import shutil
-import stat
-import random
-import string
-import atexit
+import pipes
 import hashlib
 
 import lib.pytar
@@ -44,13 +40,15 @@
     SubprocessError,
     display,
     run_command,
-    common_environment,
+    intercept_command,
     remove_tree,
     make_dirs,
     is_shippable,
     is_binary_file,
+    find_pip,
     find_executable,
     raw_command,
+    get_coverage_path,
 )
 
 from lib.ansible_util import (
@@ -109,8 +107,6 @@
 
 COMPILE_PYTHON_VERSIONS = SUPPORTED_PYTHON_VERSIONS
 
-coverage_path = ''  # pylint: disable=locally-disabled, invalid-name
-
 
 def check_startup():
     """Checks to perform at startup before running commands."""
@@ -162,30 +158,84 @@
         if args.junit:
             packages.append('junit-xml')
 
-    extras = []
+    pip = find_pip(version=args.python_version)
+
+    commands = [generate_pip_install(pip, args.command, packages=packages)]
 
     if isinstance(args, IntegrationConfig):
-        extras += ['cloud.%s' % cp for cp in get_cloud_platforms(args)]
+        for cloud_platform in get_cloud_platforms(args):
+            commands.append(generate_pip_install(pip, '%s.cloud.%s' % (args.command, cloud_platform)))
 
-    cmd = generate_pip_install(args.command, packages, extras)
+    commands = [cmd for cmd in commands if cmd]
 
-    if not cmd:
-        return
+    # only look for changes when more than one requirements file is needed
+    detect_pip_changes = len(commands) > 1
 
-    try:
-        run_command(args, cmd)
-    except SubprocessError as ex:
-        if ex.status != 2:
-            raise
+    # first pass to install requirements, changes expected unless environment is already set up
+    changes = run_pip_commands(args, pip, commands, detect_pip_changes)
+
+    if not changes:
+        return  # no changes means we can stop early
+
+    # second pass to check for conflicts in requirements, changes are not expected here
+    changes = run_pip_commands(args, pip, commands, detect_pip_changes)
+
+    if not changes:
+        return  # no changes means no conflicts
+
+    raise ApplicationError('Conflicts detected in requirements. The following commands reported changes during verification:\n%s' %
+                           '\n'.join((' '.join(pipes.quote(c) for c in cmd) for cmd in changes)))
+
+
+def run_pip_commands(args, pip, commands, detect_pip_changes=False):
+    """
+    :type args: EnvironmentConfig
+    :type pip: str
+    :type commands: list[list[str]]
+    :type detect_pip_changes: bool
+    :rtype: list[list[str]]
+    """
+    changes = []
+
+    after_list = pip_list(args, pip) if detect_pip_changes else None
+
+    for cmd in commands:
+        if not cmd:
+            continue
+
+        before_list = after_list
 
-        # If pip is too old it won't understand the arguments we passed in, so we'll need to upgrade it.
+        try:
+            run_command(args, cmd)
+        except SubprocessError as ex:
+            if ex.status != 2:
+                raise
+
+            # If pip is too old it won't understand the arguments we passed in, so we'll need to upgrade it.
+
+            # Installing "coverage" on ubuntu 16.04 fails with the error:
+            # AttributeError: 'Requirement' object has no attribute 'project_name'
+            # See: https://bugs.launchpad.net/ubuntu/xenial/+source/python-pip/+bug/1626258
+            # Upgrading pip works around the issue.
+            run_command(args, [pip, 'install', '--upgrade', 'pip'])
+            run_command(args, cmd)
 
-        # Installing "coverage" on ubuntu 16.04 fails with the error:
-        # AttributeError: 'Requirement' object has no attribute 'project_name'
-        # See: https://bugs.launchpad.net/ubuntu/xenial/+source/python-pip/+bug/1626258
-        # Upgrading pip works around the issue.
-        run_command(args, ['pip', 'install', '--upgrade', 'pip'])
-        run_command(args, cmd)
+        after_list = pip_list(args, pip) if detect_pip_changes else None
+
+        if before_list != after_list:
+            changes.append(cmd)
+
+    return changes
+
+
+def pip_list(args, pip):
+    """
+    :type args: EnvironmentConfig
+    :type pip: str
+    :rtype: str
+    """
+    stdout, _ = run_command(args, [pip, 'list'], capture=True)
+    return stdout
 
 
 def generate_egg_info(args):
@@ -195,14 +245,14 @@
     if os.path.isdir('lib/ansible.egg-info'):
         return
 
-    run_command(args, ['python', 'setup.py', 'egg_info'], capture=args.verbosity < 3)
+    run_command(args, ['python%s' % args.python_version, 'setup.py', 'egg_info'], capture=args.verbosity < 3)
 
 
-def generate_pip_install(command, packages=None, extras=None):
+def generate_pip_install(pip, command, packages=None):
     """
+    :type pip: str
     :type command: str
     :type packages: list[str] | None
-    :type extras: list[str] | None
     :rtype: list[str] | None
     """
     constraints = 'test/runner/requirements/constraints.txt'
@@ -210,15 +260,8 @@
 
     options = []
 
-    requirements_list = [requirements]
-
-    if extras:
-        for extra in extras:
-            requirements_list.append('test/runner/requirements/%s.%s.txt' % (command, extra))
-
-    for requirements in requirements_list:
-        if os.path.exists(requirements) and os.path.getsize(requirements):
-            options += ['-r', requirements]
+    if os.path.exists(requirements) and os.path.getsize(requirements):
+        options += ['-r', requirements]
 
     if packages:
         options += packages
@@ -226,7 +269,7 @@
     if not options:
         return None
 
-    return ['pip', 'install', '--disable-pip-version-check', '-c', constraints] + options
+    return [pip, 'install', '--disable-pip-version-check', '-c', constraints] + options
 
 
 def command_shell(args):
@@ -274,31 +317,26 @@
         )
 
     all_targets = tuple(walk_network_integration_targets(include_hidden=True))
-    internal_targets = command_integration_filter(args, all_targets)
-    platform_targets = set(a for t in internal_targets for a in t.aliases if a.startswith('network/'))
+    internal_targets = command_integration_filter(args, all_targets, init_callback=network_init)
+    instances = []  # type: list [lib.thread.WrappedThread]
 
     if args.platform:
-        instances = []  # type: list [lib.thread.WrappedThread]
+        get_coverage_path(args)  # initialize before starting threads
 
-        # generate an ssh key (if needed) up front once, instead of for each instance
-        SshKey(args)
+        configs = dict((config['platform_version'], config) for config in args.metadata.instance_config)
 
         for platform_version in args.platform:
             platform, version = platform_version.split('/', 1)
-            platform_target = 'network/%s/' % platform
+            config = configs.get(platform_version)
 
-            if platform_target not in platform_targets and 'network/basics/' not in platform_targets:
-                display.warning('Skipping "%s" because selected tests do not target the "%s" platform.' % (
-                    platform_version, platform))
+            if not config:
                 continue
 
-            instance = lib.thread.WrappedThread(functools.partial(network_run, args, platform, version))
+            instance = lib.thread.WrappedThread(functools.partial(network_run, args, platform, version, config))
             instance.daemon = True
             instance.start()
             instances.append(instance)
 
-        install_command_requirements(args)
-
         while any(instance.is_alive() for instance in instances):
             time.sleep(1)
 
@@ -310,22 +348,79 @@
         if not args.explain:
             with open(filename, 'w') as inventory_fd:
                 inventory_fd.write(inventory)
-    else:
-        install_command_requirements(args)
 
-    command_integration_filtered(args, internal_targets, all_targets)
+    success = False
 
+    try:
+        command_integration_filtered(args, internal_targets, all_targets)
+        success = True
+    finally:
+        if args.remote_terminate == 'always' or (args.remote_terminate == 'success' and success):
+            for instance in instances:
+                instance.result.stop()
+
+
+def network_init(args, internal_targets):
+    """
+    :type args: NetworkIntegrationConfig
+    :type internal_targets: tuple[IntegrationTarget]
+    """
+    if not args.platform:
+        return
+
+    if args.metadata.instance_config is not None:
+        return
+
+    platform_targets = set(a for t in internal_targets for a in t.aliases if a.startswith('network/'))
+
+    instances = []  # type: list [lib.thread.WrappedThread]
+
+    # generate an ssh key (if needed) up front once, instead of for each instance
+    SshKey(args)
+
+    for platform_version in args.platform:
+        platform, version = platform_version.split('/', 1)
+        platform_target = 'network/%s/' % platform
+
+        if platform_target not in platform_targets and 'network/basics/' not in platform_targets:
+            display.warning('Skipping "%s" because selected tests do not target the "%s" platform.' % (
+                platform_version, platform))
+            continue
+
+        instance = lib.thread.WrappedThread(functools.partial(network_start, args, platform, version))
+        instance.daemon = True
+        instance.start()
+        instances.append(instance)
+
+    while any(instance.is_alive() for instance in instances):
+        time.sleep(1)
 
-def network_run(args, platform, version):
+    args.metadata.instance_config = [instance.wait_for_result() for instance in instances]
+
+
+def network_start(args, platform, version):
     """
     :type args: NetworkIntegrationConfig
     :type platform: str
     :type version: str
     :rtype: AnsibleCoreCI
     """
-
     core_ci = AnsibleCoreCI(args, platform, version, stage=args.remote_stage)
     core_ci.start()
+
+    return core_ci.save()
+
+
+def network_run(args, platform, version, config):
+    """
+    :type args: NetworkIntegrationConfig
+    :type platform: str
+    :type version: str
+    :type config: dict[str, str]
+    :rtype: AnsibleCoreCI
+    """
+    core_ci = AnsibleCoreCI(args, platform, version, stage=args.remote_stage, load=False)
+    core_ci.load(config)
     core_ci.wait()
 
     manage = ManageNetworkCI(core_ci)
@@ -345,7 +440,7 @@
         options = dict(
             ansible_host=remote.connection.hostname,
             ansible_user=remote.connection.username,
-            ansible_ssh_private_key_file=remote.ssh_key.key,
+            ansible_ssh_private_key_file=os.path.abspath(remote.ssh_key.key),
             ansible_network_os=remote.platform,
             ansible_connection='local'
         )
@@ -382,19 +477,22 @@
         raise ApplicationError('Use the --windows option or provide an inventory file (see %s.template).' % filename)
 
     all_targets = tuple(walk_windows_integration_targets(include_hidden=True))
-    internal_targets = command_integration_filter(args, all_targets)
+    internal_targets = command_integration_filter(args, all_targets, init_callback=windows_init)
+    instances = []  # type: list [lib.thread.WrappedThread]
 
     if args.windows:
-        instances = []  # type: list [lib.thread.WrappedThread]
+        get_coverage_path(args)  # initialize before starting threads
+
+        configs = dict((config['platform_version'], config) for config in args.metadata.instance_config)
 
         for version in args.windows:
-            instance = lib.thread.WrappedThread(functools.partial(windows_run, args, version))
+            config = configs['windows/%s' % version]
+
+            instance = lib.thread.WrappedThread(functools.partial(windows_run, args, version, config))
             instance.daemon = True
             instance.start()
             instances.append(instance)
 
-        install_command_requirements(args)
-
         while any(instance.is_alive() for instance in instances):
             time.sleep(1)
 
@@ -406,16 +504,44 @@
         if not args.explain:
             with open(filename, 'w') as inventory_fd:
                 inventory_fd.write(inventory)
-    else:
-        install_command_requirements(args)
+
+    success = False
 
     try:
         command_integration_filtered(args, internal_targets, all_targets)
+        success = True
     finally:
-        pass
+        if args.remote_terminate == 'always' or (args.remote_terminate == 'success' and success):
+            for instance in instances:
+                instance.result.stop()
+
 
+def windows_init(args, internal_targets):  # pylint: disable=locally-disabled, unused-argument
+    """
+    :type args: WindowsIntegrationConfig
+    :type internal_targets: tuple[IntegrationTarget]
+    """
+    if not args.windows:
+        return
+
+    if args.metadata.instance_config is not None:
+        return
+
+    instances = []  # type: list [lib.thread.WrappedThread]
+
+    for version in args.windows:
+        instance = lib.thread.WrappedThread(functools.partial(windows_start, args, version))
+        instance.daemon = True
+        instance.start()
+        instances.append(instance)
+
+    while any(instance.is_alive() for instance in instances):
+        time.sleep(1)
+
+    args.metadata.instance_config = [instance.wait_for_result() for instance in instances]
 
-def windows_run(args, version):
+
+def windows_start(args, version):
     """
     :type args: WindowsIntegrationConfig
     :type version: str
@@ -423,6 +549,19 @@
     """
     core_ci = AnsibleCoreCI(args, 'windows', version, stage=args.remote_stage)
     core_ci.start()
+
+    return core_ci.save()
+
+
+def windows_run(args, version, config):
+    """
+    :type args: WindowsIntegrationConfig
+    :type version: str
+    :type config: dict[str, str]
+    :rtype: AnsibleCoreCI
+    """
+    core_ci = AnsibleCoreCI(args, 'windows', version, stage=args.remote_stage, load=False)
+    core_ci.load(config)
     core_ci.wait()
 
     manage = ManageWindowsCI(core_ci)
@@ -476,10 +615,11 @@
     return inventory
 
 
-def command_integration_filter(args, targets):
+def command_integration_filter(args, targets, init_callback=None):
     """
     :type args: IntegrationConfig
     :type targets: collections.Iterable[IntegrationTarget]
+    :type init_callback: (IntegrationConfig, tuple[IntegrationTarget]) -> None
     :rtype: tuple[IntegrationTarget]
     """
     targets = tuple(target for target in targets if 'hidden/' not in target.aliases)
@@ -502,6 +642,9 @@
     if args.start_at and not any(t.name == args.start_at for t in internal_targets):
         raise ApplicationError('Start at target matches nothing: %s' % args.start_at)
 
+    if init_callback:
+        init_callback(args, internal_targets)
+
     cloud_init(args, internal_targets)
 
     if args.delegate:
@@ -831,7 +974,7 @@
 
     for version in SUPPORTED_PYTHON_VERSIONS:
         # run all versions unless version given, in which case run only that version
-        if args.python and version != args.python:
+        if args.python and version != args.python_version:
             continue
 
         env = ansible_environment(args)
@@ -891,7 +1034,7 @@
 
     for version in COMPILE_PYTHON_VERSIONS:
         # run all versions unless version given, in which case run only that version
-        if args.python and version != args.python:
+        if args.python and version != args.python_version:
             continue
 
         display.info('Compile with Python %s' % version)
@@ -978,104 +1121,6 @@
     return TestSuccess(command, test, python_version=python_version)
 
 
-def intercept_command(args, cmd, target_name, capture=False, env=None, data=None, cwd=None, python_version=None, path=None):
-    """
-    :type args: TestConfig
-    :type cmd: collections.Iterable[str]
-    :type target_name: str
-    :type capture: bool
-    :type env: dict[str, str] | None
-    :type data: str | None
-    :type cwd: str | None
-    :type python_version: str | None
-    :type path: str | None
-    :rtype: str | None, str | None
-    """
-    if not env:
-        env = common_environment()
-
-    cmd = list(cmd)
-    inject_path = get_coverage_path(args)
-    config_path = os.path.join(inject_path, 'injector.json')
-    version = python_version or args.python_version
-    interpreter = find_executable('python%s' % version, path=path)
-    coverage_file = os.path.abspath(os.path.join(inject_path, '..', 'output', '%s=%s=%s=%s=coverage' % (
-        args.command, target_name, args.coverage_label or 'local-%s' % version, 'python-%s' % version)))
-
-    env['PATH'] = inject_path + os.pathsep + env['PATH']
-    env['ANSIBLE_TEST_PYTHON_VERSION'] = version
-    env['ANSIBLE_TEST_PYTHON_INTERPRETER'] = interpreter
-
-    config = dict(
-        python_interpreter=interpreter,
-        coverage_file=coverage_file if args.coverage else None,
-    )
-
-    if not args.explain:
-        with open(config_path, 'w') as config_fd:
-            json.dump(config, config_fd, indent=4, sort_keys=True)
-
-    return run_command(args, cmd, capture=capture, env=env, data=data, cwd=cwd)
-
-
-def get_coverage_path(args):
-    """
-    :type args: TestConfig
-    :rtype: str
-    """
-    global coverage_path  # pylint: disable=locally-disabled, global-statement, invalid-name
-
-    if coverage_path:
-        return os.path.join(coverage_path, 'coverage')
-
-    prefix = 'ansible-test-coverage-'
-    tmp_dir = '/tmp'
-
-    if args.explain:
-        return os.path.join(tmp_dir, '%stmp' % prefix, 'coverage')
-
-    src = os.path.abspath(os.path.join(os.getcwd(), 'test/runner/injector/'))
-
-    coverage_path = tempfile.mkdtemp('', prefix, dir=tmp_dir)
-    os.chmod(coverage_path, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
-
-    shutil.copytree(src, os.path.join(coverage_path, 'coverage'))
-    shutil.copy('.coveragerc', os.path.join(coverage_path, 'coverage', '.coveragerc'))
-
-    for root, dir_names, file_names in os.walk(coverage_path):
-        for name in dir_names + file_names:
-            os.chmod(os.path.join(root, name), stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
-
-    for directory in 'output', 'logs':
-        os.mkdir(os.path.join(coverage_path, directory))
-        os.chmod(os.path.join(coverage_path, directory), stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
-
-    atexit.register(cleanup_coverage_dir)
-
-    return os.path.join(coverage_path, 'coverage')
-
-
-def cleanup_coverage_dir():
-    """Copy over coverage data from temporary directory and purge temporary directory."""
-    output_dir = os.path.join(coverage_path, 'output')
-
-    for filename in os.listdir(output_dir):
-        src = os.path.join(output_dir, filename)
-        dst = os.path.join(os.getcwd(), 'test', 'results', 'coverage')
-        shutil.copy(src, dst)
-
-    logs_dir = os.path.join(coverage_path, 'logs')
-
-    for filename in os.listdir(logs_dir):
-        random_suffix = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8))
-        new_name = '%s.%s.log' % (os.path.splitext(os.path.basename(filename))[0], random_suffix)
-        src = os.path.join(logs_dir, filename)
-        dst = os.path.join(os.getcwd(), 'test', 'results', 'logs', new_name)
-        shutil.copy(src, dst)
-
-    shutil.rmtree(coverage_path)
-
-
 def get_changes_filter(args):
     """
     :type args: TestConfig
@@ -1257,12 +1302,16 @@
                             % (skip.rstrip('/'), ', '.join(skipped)))
 
     if args.python_version.startswith('3'):
-        skip = 'skip/python3/'
-        skipped = [target.name for target in targets if skip in target.aliases]
-        if skipped:
-            exclude.append(skip)
-            display.warning('Excluding tests marked "%s" which are not yet supported on python 3: %s'
-                            % (skip.rstrip('/'), ', '.join(skipped)))
+        python_version = 3
+    else:
+        python_version = 2
+
+    skip = 'skip/python%d/' % python_version
+    skipped = [target.name for target in targets if skip in target.aliases]
+    if skipped:
+        exclude.append(skip)
+        display.warning('Excluding tests marked "%s" which are not supported on python %d: %s'
+                        % (skip.rstrip('/'), python_version, ', '.join(skipped)))
 
     return exclude
 
@@ -1283,13 +1332,26 @@
             display.warning('Excluding tests marked "%s" which require --docker-privileged to run under docker: %s'
                             % (skip.rstrip('/'), ', '.join(skipped)))
 
+    python_version = 2  # images are expected to default to python 2 unless otherwise specified
+
     if args.docker.endswith('py3'):
-        skip = 'skip/python3/'
-        skipped = [target.name for target in targets if skip in target.aliases]
-        if skipped:
-            exclude.append(skip)
-            display.warning('Excluding tests marked "%s" which are not yet supported on python 3: %s'
-                            % (skip.rstrip('/'), ', '.join(skipped)))
+        python_version = 3  # docker images ending in 'py3' are expected to default to python 3
+
+    if args.docker.endswith(':default'):
+        python_version = 3  # docker images tagged 'default' are expected to default to python 3
+
+    if args.python:  # specifying a numeric --python option overrides the default python
+        if args.python.startswith('3'):
+            python_version = 3
+        elif args.python.startswith('2'):
+            python_version = 2
+
+    skip = 'skip/python%d/' % python_version
+    skipped = [target.name for target in targets if skip in target.aliases]
+    if skipped:
+        exclude.append(skip)
+        display.warning('Excluding tests marked "%s" which are not supported on python %d: %s'
+                        % (skip.rstrip('/'), python_version, ', '.join(skipped)))
 
     return exclude
 
@@ -1310,9 +1372,18 @@
     skipped = [target.name for target in targets if skip in target.aliases]
     if skipped:
         exclude.append(skip)
-        display.warning('Excluding tests marked "%s" which are not yet supported on %s: %s'
+        display.warning('Excluding tests marked "%s" which are not supported on %s: %s'
                         % (skip.rstrip('/'), platform, ', '.join(skipped)))
 
+    python_version = 2  # remotes are expected to default to python 2
+
+    skip = 'skip/python%d/' % python_version
+    skipped = [target.name for target in targets if skip in target.aliases]
+    if skipped:
+        exclude.append(skip)
+        display.warning('Excluding tests marked "%s" which are not supported on python %d: %s'
+                        % (skip.rstrip('/'), python_version, ', '.join(skipped)))
+
     return exclude
 
 
diff -Nru ansible-2.4.1.0/test/runner/lib/manage_ci.py ansible-2.4.2.0/test/runner/lib/manage_ci.py
--- ansible-2.4.1.0/test/runner/lib/manage_ci.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/manage_ci.py	2017-11-29 21:10:32.000000000 +0000
@@ -14,6 +14,7 @@
     SubprocessError,
     ApplicationError,
     run_command,
+    intercept_command,
 )
 
 from lib.core_ci import (
@@ -51,7 +52,7 @@
 
         for _ in range(1, 120):
             try:
-                run_command(self.core_ci.args, cmd, env=env)
+                intercept_command(self.core_ci.args, cmd, 'ping', env=env)
                 return
             except SubprocessError:
                 sleep(10)
@@ -93,7 +94,7 @@
 
         for _ in range(1, 90):
             try:
-                run_command(self.core_ci.args, cmd, env=env)
+                intercept_command(self.core_ci.args, cmd, 'ping', env=env)
                 return
             except SubprocessError:
                 sleep(10)
@@ -161,7 +162,7 @@
             remote_source_path = os.path.join(remote_source_dir, os.path.basename(local_source_fd.name))
 
             if not self.core_ci.args.explain:
-                lib.pytar.create_tarfile(local_source_fd.name, '.', lib.pytar.ignore)
+                lib.pytar.create_tarfile(local_source_fd.name, '.', lib.pytar.DefaultTarFilter())
 
             self.upload(local_source_fd.name, remote_source_dir)
             self.ssh('rm -rf ~/ansible && mkdir ~/ansible && cd ~/ansible && tar oxzf %s' % remote_source_path)
diff -Nru ansible-2.4.1.0/test/runner/lib/metadata.py ansible-2.4.2.0/test/runner/lib/metadata.py
--- ansible-2.4.1.0/test/runner/lib/metadata.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/metadata.py	2017-11-29 21:10:32.000000000 +0000
@@ -20,6 +20,7 @@
         """Initialize metadata."""
         self.changes = {}  # type: dict [str, tuple[tuple[int, int]]
         self.cloud_config = None  # type: dict [str, str]
+        self.instance_config = None  # type: list[dict[str, str]]
 
         if is_shippable():
             self.ci_provider = 'shippable'
@@ -54,6 +55,7 @@
         return dict(
             changes=self.changes,
             cloud_config=self.cloud_config,
+            instance_config=self.instance_config,
             ci_provider=self.ci_provider,
         )
 
@@ -88,6 +90,7 @@
         metadata = Metadata()
         metadata.changes = data['changes']
         metadata.cloud_config = data['cloud_config']
+        metadata.instance_config = data['instance_config']
         metadata.ci_provider = data['ci_provider']
 
         return metadata
diff -Nru ansible-2.4.1.0/test/runner/lib/pytar.py ansible-2.4.2.0/test/runner/lib/pytar.py
--- ansible-2.4.1.0/test/runner/lib/pytar.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/pytar.py	2017-11-29 21:10:32.000000000 +0000
@@ -2,76 +2,103 @@
 
 from __future__ import absolute_import, print_function
 
+import abc
 import tarfile
 import os
 
 from lib.util import (
     display,
+    ABC,
 )
 
 # improve performance by disabling uid/gid lookups
 tarfile.pwd = None
 tarfile.grp = None
 
-# To reduce archive time and size, ignore non-versioned files which are large or numerous.
-# Also ignore miscellaneous git related files since the .git directory is ignored.
 
-IGNORE_DIRS = (
-    '.tox',
-    '.git',
-    '.idea',
-    '__pycache__',
-    'ansible.egg-info',
-)
-
-IGNORE_FILES = (
-    '.gitignore',
-    '.gitdir',
-)
-
-IGNORE_EXTENSIONS = (
-    '.pyc',
-    '.retry',
-)
+class TarFilter(ABC):
+    """Filter to use when creating a tar file."""
+    @abc.abstractmethod
+    def ignore(self, item):
+        """
+        :type item: tarfile.TarInfo
+        :rtype: tarfile.TarInfo | None
+        """
+        pass
 
 
-def ignore(item):
+class DefaultTarFilter(TarFilter):
     """
-    :type item: tarfile.TarInfo
-    :rtype: tarfile.TarInfo | None
+    To reduce archive time and size, ignore non-versioned files which are large or numerous.
+    Also ignore miscellaneous git related files since the .git directory is ignored.
     """
-    filename = os.path.basename(item.path)
-    name, ext = os.path.splitext(filename)
-    dirs = os.path.split(item.path)
+    def __init__(self):
+        self.ignore_dirs = (
+            '.tox',
+            '.git',
+            '.idea',
+            '__pycache__',
+            'ansible.egg-info',
+        )
+
+        self.ignore_files = (
+            '.gitignore',
+            '.gitdir',
+        )
+
+        self.ignore_extensions = (
+            '.pyc',
+            '.retry',
+        )
+
+    def ignore(self, item):
+        """
+        :type item: tarfile.TarInfo
+        :rtype: tarfile.TarInfo | None
+        """
+        filename = os.path.basename(item.path)
+        name, ext = os.path.splitext(filename)
+        dirs = os.path.split(item.path)
+
+        if not item.isdir():
+            if item.path.startswith('./test/results/'):
+                return None
 
-    if not item.isdir():
-        if item.path.startswith('./test/results/'):
+            if item.path.startswith('./docs/docsite/_build/'):
+                return None
+
+        if name in self.ignore_files:
+            return None
+
+        if ext in self.ignore_extensions:
             return None
 
-        if item.path.startswith('./docs/docsite/_build/'):
+        if any(d in self.ignore_dirs for d in dirs):
             return None
 
-    if name in IGNORE_FILES:
-        return None
+        return item
 
-    if ext in IGNORE_EXTENSIONS:
-        return None
 
-    if any(d in IGNORE_DIRS for d in dirs):
-        return None
+class AllowGitTarFilter(DefaultTarFilter):
+    """
+    Filter that allows git related files normally excluded by the default tar filter.
+    """
+    def __init__(self):
+        super(AllowGitTarFilter, self).__init__()
 
-    return item
+        self.ignore_dirs = tuple(d for d in self.ignore_dirs if not d.startswith('.git'))
+        self.ignore_files = tuple(f for f in self.ignore_files if not f.startswith('.git'))
 
 
 def create_tarfile(dst_path, src_path, tar_filter):
     """
     :type dst_path: str
     :type src_path: str
-    :type tar_filter: (tarfile.TarInfo) -> tarfile.TarInfo | None
+    :type tar_filter: TarFilter
     """
     display.info('Creating a compressed tar archive of path: %s' % src_path, verbosity=1)
 
     with tarfile.TarFile.gzopen(dst_path, mode='w', compresslevel=4) as tar:
-        tar.add(src_path, filter=tar_filter)
+        tar.add(src_path, filter=tar_filter.ignore)
 
     display.info('Resulting archive is %d bytes.' % os.path.getsize(dst_path), verbosity=1)
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/ansible_doc.py ansible-2.4.2.0/test/runner/lib/sanity/ansible_doc.py
--- ansible-2.4.1.0/test/runner/lib/sanity/ansible_doc.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/ansible_doc.py	2017-11-29 21:10:32.000000000 +0000
@@ -11,16 +11,13 @@
 from lib.util import (
     SubprocessError,
     display,
+    intercept_command,
 )
 
 from lib.ansible_util import (
     ansible_environment,
 )
 
-from lib.executor import (
-    intercept_command,
-)
-
 from lib.config import (
     SanityConfig,
 )
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/import.py ansible-2.4.2.0/test/runner/lib/sanity/import.py
--- ansible-2.4.1.0/test/runner/lib/sanity/import.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/import.py	2017-11-29 21:10:32.000000000 +0000
@@ -15,6 +15,7 @@
 from lib.util import (
     SubprocessError,
     run_command,
+    intercept_command,
     remove_tree,
 )
 
@@ -23,7 +24,6 @@
 )
 
 from lib.executor import (
-    intercept_command,
     generate_pip_install,
 )
 
@@ -83,7 +83,7 @@
 
         # make sure coverage is available in the virtual environment if needed
         if args.coverage:
-            run_command(args, generate_pip_install('sanity.import', packages=['coverage']), env=env)
+            run_command(args, generate_pip_install('pip', 'sanity.import', packages=['coverage']), env=env)
             run_command(args, ['pip', 'uninstall', '--disable-pip-version-check', '-y', 'pip'], env=env)
 
         cmd = ['importer.py'] + paths
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/__init__.py ansible-2.4.2.0/test/runner/lib/sanity/__init__.py
--- ansible-2.4.1.0/test/runner/lib/sanity/__init__.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/__init__.py	2017-11-29 21:10:32.000000000 +0000
@@ -83,10 +83,10 @@
         if isinstance(test, SanityMultipleVersion):
             versions = SUPPORTED_PYTHON_VERSIONS
         else:
-            versions = None,
+            versions = (None,)
 
         for version in versions:
-            if args.python and version and version != args.python:
+            if args.python and version and version != args.python_version:
                 continue
 
             display.info('Sanity check using %s%s' % (test.name, ' with Python %s' % version if version else ''))
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/pep8.py ansible-2.4.2.0/test/runner/lib/sanity/pep8.py
--- ansible-2.4.1.0/test/runner/lib/sanity/pep8.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/pep8.py	2017-11-29 21:10:32.000000000 +0000
@@ -15,6 +15,7 @@
     SubprocessError,
     display,
     run_command,
+    find_executable,
 )
 
 from lib.config import (
@@ -55,7 +56,8 @@
         paths = sorted(i.path for i in targets.include if (os.path.splitext(i.path)[1] == '.py' or i.path.startswith('bin/')) and i.path not in skip_paths_set)
 
         cmd = [
-            'pycodestyle',
+            'python%s' % args.python_version,
+            find_executable('pycodestyle'),
             '--max-line-length', '160',
             '--config', '/dev/null',
             '--ignore', ','.join(sorted(current_ignore)),
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/pylint.py ansible-2.4.2.0/test/runner/lib/sanity/pylint.py
--- ansible-2.4.1.0/test/runner/lib/sanity/pylint.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/pylint.py	2017-11-29 21:10:32.000000000 +0000
@@ -3,6 +3,7 @@
 
 import json
 import os
+import datetime
 
 from lib.sanity import (
     SanitySingleVersion,
@@ -16,6 +17,7 @@
     SubprocessError,
     run_command,
     display,
+    find_executable,
 )
 
 from lib.ansible_util import (
@@ -52,51 +54,54 @@
         with open(PYLINT_SKIP_PATH, 'r') as skip_fd:
             skip_paths = skip_fd.read().splitlines()
 
-        with open('test/sanity/pylint/disable.txt', 'r') as disable_fd:
-            disable = set(c for c in disable_fd.read().splitlines() if not c.strip().startswith('#'))
-
-        with open('test/sanity/pylint/enable.txt', 'r') as enable_fd:
-            enable = set(c for c in enable_fd.read().splitlines() if not c.strip().startswith('#'))
-
         skip_paths_set = set(skip_paths)
 
         paths = sorted(i.path for i in targets.include if (os.path.splitext(i.path)[1] == '.py' or i.path.startswith('bin/')) and i.path not in skip_paths_set)
 
-        cmd = [
-            'pylint',
-            '--jobs', '0',
-            '--reports', 'n',
-            '--max-line-length', '160',
-            '--rcfile', '/dev/null',
-            '--ignored-modules', '_MovedItems',
-            '--output-format', 'json',
-            '--disable', ','.join(sorted(disable)),
-            '--enable', ','.join(sorted(enable)),
-        ] + paths
+        contexts = {}
+        remaining_paths = set(paths)
 
-        env = ansible_environment(args)
+        def add_context(available_paths, context_name, context_filter):
+            """
+            :type available_paths: set[str]
+            :type context_name: str
+            :type context_filter: (str) -> bool
+            """
+            filtered_paths = set(p for p in available_paths if context_filter(p))
+            contexts[context_name] = sorted(filtered_paths)
+            available_paths -= filtered_paths
+
+        add_context(remaining_paths, 'ansible-test', lambda p: p.startswith('test/runner/'))
+        add_context(remaining_paths, 'units', lambda p: p.startswith('test/units/'))
+        add_context(remaining_paths, 'test', lambda p: p.startswith('test/'))
+        add_context(remaining_paths, 'hacking', lambda p: p.startswith('hacking/'))
+        add_context(remaining_paths, 'modules', lambda p: p.startswith('lib/ansible/modules/'))
+        add_context(remaining_paths, 'module_utils', lambda p: p.startswith('lib/ansible/module_utils/'))
+        add_context(remaining_paths, 'ansible', lambda p: True)
+
+        messages = []
+        context_times = []
+
+        test_start = datetime.datetime.utcnow()
+
+        for context in sorted(contexts):
+            context_paths = contexts[context]
+
+            if not context_paths:
+                continue
+
+            context_start = datetime.datetime.utcnow()
+            messages += self.pylint(args, context, context_paths)
+            context_end = datetime.datetime.utcnow()
 
-        if paths:
-            try:
-                stdout, stderr = run_command(args, cmd, env=env, capture=True)
-                status = 0
-            except SubprocessError as ex:
-                stdout = ex.stdout
-                stderr = ex.stderr
-                status = ex.status
+            context_times.append('%s: %d (%s)' % (context, len(context_paths), context_end - context_start))
 
-            if stderr or status >= 32:
-                raise SubprocessError(cmd=cmd, status=status, stderr=stderr, stdout=stdout)
-        else:
-            stdout = None
+        test_end = datetime.datetime.utcnow()
 
-        if args.explain:
-            return SanitySuccess(self.name)
+        for context_time in context_times:
+            display.info(context_time, verbosity=4)
 
-        if stdout:
-            messages = json.loads(stdout)
-        else:
-            messages = []
+        display.info('total: %d (%s)' % (len(paths), test_end - test_start), verbosity=4)
 
         errors = [SanityMessage(
             message=m['message'].replace('\n', ' '),
@@ -127,3 +132,48 @@
             return SanityFailure(self.name, messages=errors)
 
         return SanitySuccess(self.name)
+
+    def pylint(self, args, context, paths):
+        """
+        :type args: SanityConfig
+        :param context: str
+        :param paths: list[str]
+        :return: list[dict[str, str]]
+        """
+        rcfile = 'test/sanity/pylint/config/%s' % context
+
+        if not os.path.exists(rcfile):
+            rcfile = 'test/sanity/pylint/config/default'
+
+        cmd = [
+            'python%s' % args.python_version,
+            find_executable('pylint'),
+            '--jobs', '0',
+            '--reports', 'n',
+            '--max-line-length', '160',
+            '--rcfile', rcfile,
+            '--output-format', 'json',
+        ] + paths
+
+        env = ansible_environment(args)
+
+        if paths:
+            try:
+                stdout, stderr = run_command(args, cmd, env=env, capture=True)
+                status = 0
+            except SubprocessError as ex:
+                stdout = ex.stdout
+                stderr = ex.stderr
+                status = ex.status
+
+            if stderr or status >= 32:
+                raise SubprocessError(cmd=cmd, status=status, stderr=stderr, stdout=stdout)
+        else:
+            stdout = None
+
+        if not args.explain and stdout:
+            messages = json.loads(stdout)
+        else:
+            messages = []
+
+        return messages
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/rstcheck.py ansible-2.4.2.0/test/runner/lib/sanity/rstcheck.py
--- ansible-2.4.1.0/test/runner/lib/sanity/rstcheck.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/rstcheck.py	2017-11-29 21:10:32.000000000 +0000
@@ -15,6 +15,7 @@
     SubprocessError,
     run_command,
     parse_to_dict,
+    find_executable,
 )
 
 from lib.config import (
@@ -39,7 +40,8 @@
             return SanitySkipped(self.name)
 
         cmd = [
-            'rstcheck',
+            'python%s' % args.python_version,
+            find_executable('rstcheck'),
             '--report', 'warning',
             '--ignore-substitutions', ','.join(ignore_substitutions),
         ] + paths
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/validate_modules.py ansible-2.4.2.0/test/runner/lib/sanity/validate_modules.py
--- ansible-2.4.1.0/test/runner/lib/sanity/validate_modules.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/validate_modules.py	2017-11-29 21:10:32.000000000 +0000
@@ -44,6 +44,7 @@
             return SanitySkipped(self.name)
 
         cmd = [
+            'python%s' % args.python_version,
             'test/sanity/validate-modules/validate-modules',
             '--format', 'json',
         ] + paths
diff -Nru ansible-2.4.1.0/test/runner/lib/sanity/yamllint.py ansible-2.4.2.0/test/runner/lib/sanity/yamllint.py
--- ansible-2.4.1.0/test/runner/lib/sanity/yamllint.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/sanity/yamllint.py	2017-11-29 21:10:32.000000000 +0000
@@ -15,6 +15,7 @@
 from lib.util import (
     SubprocessError,
     run_command,
+    find_executable,
 )
 
 from lib.config import (
@@ -36,7 +37,8 @@
             return SanitySkipped(self.name)
 
         cmd = [
-            'yamllint',
+            'python%s' % args.python_version,
+            find_executable('yamllint'),
             '--format', 'parsable',
         ] + paths
 
diff -Nru ansible-2.4.1.0/test/runner/lib/thread.py ansible-2.4.2.0/test/runner/lib/thread.py
--- ansible-2.4.1.0/test/runner/lib/thread.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/thread.py	2017-11-29 21:10:32.000000000 +0000
@@ -23,6 +23,7 @@
         super(WrappedThread, self).__init__()
         self._result = queue.Queue()
         self.action = action
+        self.result = None
 
     def run(self):
         """
@@ -41,9 +42,13 @@
         :rtype: any
         """
         result, exception = self._result.get()
+
         if exception:
             if sys.version_info[0] > 2:
                 raise exception[1].with_traceback(exception[2])
             # noinspection PyRedundantParentheses
             exec('raise exception[0], exception[1], exception[2]')  # pylint: disable=locally-disabled, exec-used
+
+        self.result = result
+
         return result
diff -Nru ansible-2.4.1.0/test/runner/lib/util.py ansible-2.4.2.0/test/runner/lib/util.py
--- ansible-2.4.1.0/test/runner/lib/util.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/lib/util.py	2017-11-29 21:10:32.000000000 +0000
@@ -2,19 +2,46 @@
 
 from __future__ import absolute_import, print_function
 
-import abc
+import atexit
 import errno
+import filecmp
 import inspect
+import json
 import os
 import pipes
 import pkgutil
+import random
+import re
 import shutil
+import stat
+import string
 import subprocess
-import re
 import sys
+import tempfile
 import time
 
-ABC = abc.ABCMeta('ABC', (object,), {'__slots__': ()})  # compatible with Python 2 *and* 3
+try:
+    from abc import ABC
+except ImportError:
+    from abc import ABCMeta
+    ABC = ABCMeta('ABC', (), {})
+
+DOCKER_COMPLETION = {}
+
+coverage_path = ''  # pylint: disable=locally-disabled, invalid-name
+
+
+def get_docker_completion():
+    """
+    :rtype: dict[str, str]
+    """
+    if not DOCKER_COMPLETION:
+        with open('test/runner/completion/docker.txt', 'r') as completion_fd:
+            images = completion_fd.read().splitlines()
+
+        DOCKER_COMPLETION.update(dict((i.split('@')[0], i) for i in images))
+
+    return DOCKER_COMPLETION
 
 
 def is_shippable():
@@ -32,6 +59,51 @@
         os.remove(path)
 
 
+def find_pip(path=None, version=None):
+    """
+    :type path: str | None
+    :type version: str | None
+    :rtype: str
+    """
+    if version:
+        version_info = version.split('.')
+        python_bin = find_executable('python%s' % version, path=path)
+    else:
+        version_info = sys.version_info
+        python_bin = sys.executable
+
+    choices = (
+        'pip%s' % '.'.join(str(i) for i in version_info[:2]),
+        'pip%s' % version_info[0],
+        'pip',
+    )
+
+    pip = None
+
+    for choice in choices:
+        pip = find_executable(choice, required=False, path=path)
+
+        if pip:
+            break
+
+    if not pip:
+        raise ApplicationError('Required program not found: %s' % ', '.join(choices))
+
+    with open(pip) as pip_fd:
+        shebang = pip_fd.readline().strip()
+
+    if not shebang.startswith('#!') or ' ' in shebang:
+        raise ApplicationError('Unexpected shebang in "%s": %s' % (pip, shebang))
+
+    our_python = os.path.realpath(python_bin)
+    pip_python = os.path.realpath(shebang[2:])
+
+    if our_python != pip_python and not filecmp.cmp(our_python, pip_python, False):
+        raise ApplicationError('Current interpreter "%s" does not match "%s" interpreter "%s".' % (our_python, pip, pip_python))
+
+    return pip
+
+
 def find_executable(executable, cwd=None, path=None, required=True):
     """
     :type executable: str
@@ -84,6 +156,104 @@
     return match
 
 
+def intercept_command(args, cmd, target_name, capture=False, env=None, data=None, cwd=None, python_version=None, path=None):
+    """
+    :type args: TestConfig
+    :type cmd: collections.Iterable[str]
+    :type target_name: str
+    :type capture: bool
+    :type env: dict[str, str] | None
+    :type data: str | None
+    :type cwd: str | None
+    :type python_version: str | None
+    :type path: str | None
+    :rtype: str | None, str | None
+    """
+    if not env:
+        env = common_environment()
+
+    cmd = list(cmd)
+    inject_path = get_coverage_path(args)
+    config_path = os.path.join(inject_path, 'injector.json')
+    version = python_version or args.python_version
+    interpreter = find_executable('python%s' % version, path=path)
+    coverage_file = os.path.abspath(os.path.join(inject_path, '..', 'output', '%s=%s=%s=%s=coverage' % (
+        args.command, target_name, args.coverage_label or 'local-%s' % version, 'python-%s' % version)))
+
+    env['PATH'] = inject_path + os.pathsep + env['PATH']
+    env['ANSIBLE_TEST_PYTHON_VERSION'] = version
+    env['ANSIBLE_TEST_PYTHON_INTERPRETER'] = interpreter
+
+    config = dict(
+        python_interpreter=interpreter,
+        coverage_file=coverage_file if args.coverage else None,
+    )
+
+    if not args.explain:
+        with open(config_path, 'w') as config_fd:
+            json.dump(config, config_fd, indent=4, sort_keys=True)
+
+    return run_command(args, cmd, capture=capture, env=env, data=data, cwd=cwd)
+
+
+def get_coverage_path(args):
+    """
+    :type args: TestConfig
+    :rtype: str
+    """
+    global coverage_path  # pylint: disable=locally-disabled, global-statement, invalid-name
+
+    if coverage_path:
+        return os.path.join(coverage_path, 'coverage')
+
+    prefix = 'ansible-test-coverage-'
+    tmp_dir = '/tmp'
+
+    if args.explain:
+        return os.path.join(tmp_dir, '%stmp' % prefix, 'coverage')
+
+    src = os.path.abspath(os.path.join(os.getcwd(), 'test/runner/injector/'))
+
+    coverage_path = tempfile.mkdtemp('', prefix, dir=tmp_dir)
+    os.chmod(coverage_path, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
+
+    shutil.copytree(src, os.path.join(coverage_path, 'coverage'))
+    shutil.copy('.coveragerc', os.path.join(coverage_path, 'coverage', '.coveragerc'))
+
+    for root, dir_names, file_names in os.walk(coverage_path):
+        for name in dir_names + file_names:
+            os.chmod(os.path.join(root, name), stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
+
+    for directory in 'output', 'logs':
+        os.mkdir(os.path.join(coverage_path, directory))
+        os.chmod(os.path.join(coverage_path, directory), stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
+
+    atexit.register(cleanup_coverage_dir)
+
+    return os.path.join(coverage_path, 'coverage')
+
+
+def cleanup_coverage_dir():
+    """Copy over coverage data from temporary directory and purge temporary directory."""
+    output_dir = os.path.join(coverage_path, 'output')
+
+    for filename in os.listdir(output_dir):
+        src = os.path.join(output_dir, filename)
+        dst = os.path.join(os.getcwd(), 'test', 'results', 'coverage')
+        shutil.copy(src, dst)
+
+    logs_dir = os.path.join(coverage_path, 'logs')
+
+    for filename in os.listdir(logs_dir):
+        random_suffix = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8))
+        new_name = '%s.%s.log' % (os.path.splitext(os.path.basename(filename))[0], random_suffix)
+        src = os.path.join(logs_dir, filename)
+        dst = os.path.join(os.getcwd(), 'test', 'results', 'logs', new_name)
+        shutil.copy(src, dst)
+
+    shutil.rmtree(coverage_path)
+
+
 def run_command(args, cmd, capture=False, env=None, data=None, cwd=None, always=False, stdin=None, stdout=None,
                 cmd_verbosity=1, str_errors='strict'):
     """
@@ -453,6 +623,8 @@
     if not name or any((c in name) for c in ('/', ':')):
         return name
 
+    name = get_docker_completion().get(name, name)
+
     return 'ansible/ansible:%s' % name
 
 
diff -Nru ansible-2.4.1.0/test/runner/requirements/constraints.txt ansible-2.4.2.0/test/runner/requirements/constraints.txt
--- ansible-2.4.1.0/test/runner/requirements/constraints.txt	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/requirements/constraints.txt	2017-11-29 21:10:32.000000000 +0000
@@ -1,6 +1,7 @@
 coverage >= 4.2, != 4.3.2 # features in 4.2+ required, avoid known bug in 4.3.2 on python 2.6
 pywinrm >= 0.2.1 # 0.1.1 required, but 0.2.1 provides better performance
-pylint >= 1.5.3, < 1.7.0 # 1.4.1 adds JSON output, but 1.5.3 fixes bugs related to JSON output
+pylint == 1.7.4 ; python_version >= '3.5' # versions before 1.7.1 hang or fail to install on python 3.x
+pylint == 1.6.5 ; python_version <= '2.7' # versions after 1.6.5 hang or fail during test on python 2.x
 sphinx < 1.6 ; python_version < '2.7' # sphinx 1.6 and later require python 2.7 or later
 wheel < 0.30.0 ; python_version < '2.7' # wheel 0.30.0 and later require python 2.7 or later
 yamllint != 1.8.0 ; python_version < '2.7' # yamllint 1.8.0 requires python 2.7+ while earlier/later versions do not
diff -Nru ansible-2.4.1.0/test/runner/requirements/integration.cloud.azure.txt ansible-2.4.2.0/test/runner/requirements/integration.cloud.azure.txt
--- ansible-2.4.1.0/test/runner/requirements/integration.cloud.azure.txt	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/runner/requirements/integration.cloud.azure.txt	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,16 @@
+packaging
+requests[security]
+azure-mgmt-compute>=2.0.0,<3
+azure-mgmt-network>=1.3.0,<2
+azure-mgmt-storage>=1.2.0,<2
+azure-mgmt-resource>=1.1.0,<2
+azure-storage>=0.35.1,<0.36
+azure-cli-core>=2.0.12,<3
+msrest!=0.4.15
+msrestazure>=0.4.11,<0.5
+azure-mgmt-dns>=1.0.1,<2
+azure-mgmt-keyvault>=0.40.0,<0.41
+azure-mgmt-batch>=4.1.0,<5
+azure-mgmt-sql>=0.7.1,<0.8
+azure-mgmt-web>=0.32.0,<0.33
+azure-mgmt-containerservice>=1.0.0,<2.0.0
\ No newline at end of file
diff -Nru ansible-2.4.1.0/test/runner/requirements/sanity.txt ansible-2.4.2.0/test/runner/requirements/sanity.txt
--- ansible-2.4.1.0/test/runner/requirements/sanity.txt	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/requirements/sanity.txt	2017-11-29 21:10:32.000000000 +0000
@@ -3,7 +3,7 @@
 mock
 paramiko
 pycodestyle
-pylint
+pylint ; python_version >= '2.7' # pylint 1.5.3+ is required for non-buggy JSON output, but 1.4+ requires python 2.7+
 pytest
 rstcheck
 sphinx
diff -Nru ansible-2.4.1.0/test/runner/test.py ansible-2.4.2.0/test/runner/test.py
--- ansible-2.4.1.0/test/runner/test.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/runner/test.py	2017-11-29 21:10:32.000000000 +0000
@@ -12,6 +12,8 @@
     ApplicationError,
     display,
     raw_command,
+    find_pip,
+    get_docker_completion,
 )
 
 from lib.delegation import (
@@ -112,7 +114,7 @@
     except ImportError:
         if '--requirements' not in sys.argv:
             raise
-        raw_command(generate_pip_install('ansible-test'))
+        raw_command(generate_pip_install(find_pip(), 'ansible-test'))
         import argparse
 
     try:
@@ -255,6 +257,8 @@
                                      targets=walk_network_integration_targets,
                                      config=NetworkIntegrationConfig)
 
+    add_extra_docker_options(network_integration, integration=False)
+
     network_integration.add_argument('--platform',
                                      metavar='PLATFORM',
                                      action='append',
@@ -272,6 +276,8 @@
                                      targets=walk_windows_integration_targets,
                                      config=WindowsIntegrationConfig)
 
+    add_extra_docker_options(windows_integration, integration=False)
+
     windows_integration.add_argument('--windows',
                                      metavar='VERSION',
                                      action='append',
@@ -578,6 +584,10 @@
                         dest='docker_pull',
                         help='do not explicitly pull the latest docker images')
 
+    docker.add_argument('--docker-keep-git',
+                        action='store_true',
+                        help='transfer git related files into the docker container')
+
     if not integration:
         return
 
@@ -622,8 +632,7 @@
     """
     del parsed_args
 
-    with open('test/runner/completion/docker.txt', 'r') as completion_fd:
-        images = completion_fd.read().splitlines()
+    images = sorted(get_docker_completion().keys())
 
     return [i for i in images if i.startswith(prefix)]
 
diff -Nru ansible-2.4.1.0/test/sanity/code-smell/azure-requirements.py ansible-2.4.2.0/test/sanity/code-smell/azure-requirements.py
--- ansible-2.4.1.0/test/sanity/code-smell/azure-requirements.py	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/code-smell/azure-requirements.py	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+"""Make sure the Azure requirements files match."""
+
+import filecmp
+
+src = 'packaging/requirements/requirements-azure.txt'
+dst = 'test/runner/requirements/integration.cloud.azure.txt'
+
+if not filecmp.cmp(src, dst):
+    print('Update the Azure integration test requirements with the packaging test requirements:')
+    print('cp %s %s' % (src, dst))
+    exit(1)
diff -Nru ansible-2.4.1.0/test/sanity/code-smell/pylint-ansible-test.sh ansible-2.4.2.0/test/sanity/code-smell/pylint-ansible-test.sh
--- ansible-2.4.1.0/test/sanity/code-smell/pylint-ansible-test.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/code-smell/pylint-ansible-test.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-cd test/runner/
-
-pylint --max-line-length=160 --reports=n ./*.py ./*/*.py ./*/*/*.py \
-    --jobs 2 \
-    --rcfile /dev/null \
-    --function-rgx '[a-z_][a-z0-9_]{2,40}$' \
-    -d unused-import \
-    -d too-few-public-methods \
-    -d too-many-arguments \
-    -d too-many-branches \
-    -d too-many-locals \
-    -d too-many-statements \
-    -d too-many-nested-blocks \
-    -d too-many-instance-attributes \
-    -d too-many-lines \
-    -d too-many-return-statements
diff -Nru ansible-2.4.1.0/test/sanity/code-smell/test-constraints.sh ansible-2.4.2.0/test/sanity/code-smell/test-constraints.sh
--- ansible-2.4.1.0/test/sanity/code-smell/test-constraints.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/code-smell/test-constraints.sh	2017-11-29 21:10:32.000000000 +0000
@@ -5,6 +5,7 @@
         | grep -v '(sanity_ok)$' \
         | sed 's/ *;.*$//; s/ #.*$//' \
         | grep -v '/constraints.txt:' \
+        | grep -v '/integration.cloud.azure.txt:' \
         | grep '[<>=]'
 )
 
diff -Nru ansible-2.4.1.0/test/sanity/pylint/config/ansible-test ansible-2.4.2.0/test/sanity/pylint/config/ansible-test
--- ansible-2.4.1.0/test/sanity/pylint/config/ansible-test	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/pylint/config/ansible-test	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,19 @@
+[MESSAGES CONTROL]
+
+disable=
+    no-self-use,
+    too-few-public-methods,
+    too-many-arguments,
+    too-many-branches,
+    too-many-instance-attributes,
+    too-many-lines,
+    too-many-locals,
+    too-many-nested-blocks,
+    too-many-return-statements,
+    too-many-statements,
+    unused-import,
+
+[BASIC]
+
+method-rgx=[a-z_][a-z0-9_]{2,40}$
+function-rgx=[a-z_][a-z0-9_]{2,40}$
diff -Nru ansible-2.4.1.0/test/sanity/pylint/config/default ansible-2.4.2.0/test/sanity/pylint/config/default
--- ansible-2.4.1.0/test/sanity/pylint/config/default	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/pylint/config/default	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,123 @@
+[MESSAGES CONTROL]
+
+disable=
+    abstract-method,
+    access-member-before-definition,
+    anomalous-backslash-in-string,
+    anomalous-unicode-escape-in-string,
+    arguments-differ,
+    assignment-from-no-return,
+    attribute-defined-outside-init,
+    bad-continuation,
+    bad-format-string,
+    bad-indentation,
+    bad-mcs-classmethod-argument,
+    bad-open-mode,
+    bad-whitespace,
+    bare-except,
+    blacklisted-name,
+    broad-except,
+    cell-var-from-loop,
+    consider-iterating-dictionary,
+    consider-merging-isinstance,
+    consider-using-enumerate,
+    consider-using-ternary,
+    dangerous-default-value,
+    deprecated-lambda,
+    deprecated-method,
+    deprecated-module,
+    duplicate-key,
+    eval-used,
+    exec-used,
+    expression-not-assigned,
+    fixme,
+    function-redefined,
+    global-at-module-level,
+    global-statement,
+    global-variable-not-assigned,
+    global-variable-undefined,
+    import-error,
+    import-self,
+    invalid-name,
+    invalid-sequence-index,
+    invalid-unary-operand-type,
+    len-as-condition,
+    line-too-long,
+    literal-comparison,
+    locally-disabled,
+    logging-format-interpolation,
+    logging-not-lazy,
+    lost-exception,
+    method-hidden,
+    misplaced-comparison-constant,
+    missing-docstring,
+    no-else-return,
+    no-init,
+    no-member,
+    no-name-in-module,
+    no-self-use,
+    no-value-for-parameter,
+    non-iterator-returned,
+    not-a-mapping,
+    not-an-iterable,
+    not-callable,
+    old-style-class,
+    pointless-statement,
+    pointless-string-statement,
+    protected-access,
+    raising-bad-type,
+    redefined-argument-from-local,
+    redefined-builtin,
+    redefined-outer-name,
+    redefined-variable-type,
+    redundant-unittest-assert,
+    reimported,
+    relative-import,
+    signature-differs,
+    simplifiable-if-statement,
+    super-init-not-called,
+    superfluous-parens,
+    too-few-public-methods,
+    too-many-ancestors,
+    too-many-arguments,
+    too-many-boolean-expressions,
+    too-many-branches,
+    too-many-function-args,
+    too-many-instance-attributes,
+    too-many-lines,
+    too-many-locals,
+    too-many-nested-blocks,
+    too-many-public-methods,
+    too-many-return-statements,
+    too-many-statements,
+    trailing-comma-tuple,
+    trailing-newlines,
+    unbalanced-tuple-unpacking,
+    undefined-loop-variable,
+    unexpected-keyword-arg,
+    ungrouped-imports,
+    unidiomatic-typecheck,
+    unnecessary-lambda,
+    unnecessary-pass,
+    unneeded-not,
+    unreachable,
+    unsubscriptable-object,
+    unsupported-assignment-operation,
+    unsupported-delete-operation,
+    unsupported-membership-test,
+    unused-argument,
+    unused-import,
+    unused-variable,
+    unused-wildcard-import,
+    used-before-assignment,
+    useless-else-on-loop,
+    useless-super-delegation,
+    using-constant-test,
+    wildcard-import,
+    wrong-import-order,
+    wrong-import-position,
+
+[TYPECHECK]
+
+ignored-modules=
+    _MovedItems,
diff -Nru ansible-2.4.1.0/test/sanity/pylint/disable.txt ansible-2.4.2.0/test/sanity/pylint/disable.txt
--- ansible-2.4.1.0/test/sanity/pylint/disable.txt	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/pylint/disable.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-abstract-method
-access-member-before-definition
-anomalous-backslash-in-string
-anomalous-unicode-escape-in-string
-arguments-differ
-assignment-from-no-return
-attribute-defined-outside-init
-bad-continuation
-bad-format-string
-bad-indentation
-bad-mcs-classmethod-argument
-bad-open-mode
-bad-whitespace
-bare-except
-blacklisted-name
-broad-except
-cell-var-from-loop
-consider-iterating-dictionary
-consider-using-enumerate
-dangerous-default-value
-deprecated-lambda
-deprecated-method
-deprecated-module
-duplicate-key
-eval-used
-exec-used
-expression-not-assigned
-fixme
-function-redefined
-global-at-module-level
-global-statement
-global-variable-not-assigned
-global-variable-undefined
-import-error
-import-self
-invalid-encoded-data
-invalid-name
-line-too-long
-locally-disabled
-logging-format-interpolation
-logging-not-lazy
-lost-exception
-method-hidden
-misplaced-comparison-constant
-missing-docstring
-no-init
-no-member
-no-name-in-module
-no-self-use
-no-value-for-parameter
-non-iterator-returned
-not-a-mapping
-not-an-iterable
-not-callable
-old-style-class
-pointless-statement
-pointless-string-statement
-protected-access
-raising-bad-type
-redefined-builtin
-redefined-outer-name
-redefined-variable-type
-redundant-unittest-assert
-reimported
-relative-import
-signature-differs
-simplifiable-if-statement
-super-init-not-called
-superfluous-parens
-suppressed-message
-too-few-public-methods
-too-many-ancestors
-too-many-arguments
-too-many-boolean-expressions
-too-many-branches
-too-many-function-args
-too-many-instance-attributes
-too-many-lines
-too-many-locals
-too-many-nested-blocks
-too-many-public-methods
-too-many-return-statements
-too-many-statements
-trailing-newlines
-undefined-loop-variable
-unexpected-keyword-arg
-ungrouped-imports
-unidiomatic-typecheck
-unnecessary-lambda
-unnecessary-pass
-unneeded-not
-unreachable
-unsubscriptable-object
-unsupported-membership-test
-unused-argument
-unused-import
-unused-variable
-unused-wildcard-import
-used-before-assignment
-useless-else-on-loop
-useless-suppression
-using-constant-test
-wildcard-import
-wrong-import-order
-wrong-import-position
diff -Nru ansible-2.4.1.0/test/sanity/validate-modules/main.py ansible-2.4.2.0/test/sanity/validate-modules/main.py
--- ansible-2.4.1.0/test/sanity/validate-modules/main.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/validate-modules/main.py	2017-11-29 21:10:32.000000000 +0000
@@ -23,6 +23,7 @@
 import argparse
 import ast
 import json
+import errno
 import os
 import re
 import subprocess
@@ -1214,7 +1215,20 @@
         else:
             self.base_tree = []
 
-        self.head_tree = self._git(['ls-tree', '-r', '--name-only', 'HEAD', 'lib/ansible/modules/'])
+        try:
+            self.head_tree = self._git(['ls-tree', '-r', '--name-only', 'HEAD', 'lib/ansible/modules/'])
+        except GitError as ex:
+            if ex.status == 128:
+                # fallback when there is no .git directory
+                self.head_tree = self._get_module_files()
+            else:
+                raise
+        except OSError as ex:
+            if ex.errno == errno.ENOENT:
+                # fallback when git is not installed
+                self.head_tree = self._get_module_files()
+            else:
+                raise
 
         self.base_module_paths = dict((os.path.basename(p), p) for p in self.base_tree if os.path.splitext(p)[1] in ('.py', '.ps1'))
 
@@ -1230,13 +1244,32 @@
                     self.head_aliased_modules.add(os.path.basename(os.path.realpath(path)))
 
     @staticmethod
+    def _get_module_files():
+        module_files = []
+
+        for (dir_path, dir_names, file_names) in os.walk('lib/ansible/modules/'):
+            for file_name in file_names:
+                module_files.append(os.path.join(dir_path, file_name))
+
+        return module_files
+
+    @staticmethod
     def _git(args):
         cmd = ['git'] + args
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
+        if p.returncode != 0:
+            raise GitError(stderr, p.returncode)
         return stdout.decode('utf-8').splitlines()
 
 
+class GitError(Exception):
+    def __init__(self, message, status):
+        super(GitError, self).__init__(message)
+
+        self.status = status
+
+
 if __name__ == '__main__':
     try:
         main()
diff -Nru ansible-2.4.1.0/test/sanity/validate-modules/validate-modules ansible-2.4.2.0/test/sanity/validate-modules/validate-modules
--- ansible-2.4.1.0/test/sanity/validate-modules/validate-modules	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/sanity/validate-modules/validate-modules	2017-11-29 21:10:32.000000000 +0000
@@ -23,6 +23,7 @@
 import argparse
 import ast
 import json
+import errno
 import os
 import re
 import subprocess
@@ -1214,7 +1215,20 @@
         else:
             self.base_tree = []
 
-        self.head_tree = self._git(['ls-tree', '-r', '--name-only', 'HEAD', 'lib/ansible/modules/'])
+        try:
+            self.head_tree = self._git(['ls-tree', '-r', '--name-only', 'HEAD', 'lib/ansible/modules/'])
+        except GitError as ex:
+            if ex.status == 128:
+                # fallback when there is no .git directory
+                self.head_tree = self._get_module_files()
+            else:
+                raise
+        except OSError as ex:
+            if ex.errno == errno.ENOENT:
+                # fallback when git is not installed
+                self.head_tree = self._get_module_files()
+            else:
+                raise
 
         self.base_module_paths = dict((os.path.basename(p), p) for p in self.base_tree if os.path.splitext(p)[1] in ('.py', '.ps1'))
 
@@ -1230,13 +1244,32 @@
                     self.head_aliased_modules.add(os.path.basename(os.path.realpath(path)))
 
     @staticmethod
+    def _get_module_files():
+        module_files = []
+
+        for (dir_path, dir_names, file_names) in os.walk('lib/ansible/modules/'):
+            for file_name in file_names:
+                module_files.append(os.path.join(dir_path, file_name))
+
+        return module_files
+
+    @staticmethod
     def _git(args):
         cmd = ['git'] + args
         p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout, stderr = p.communicate()
+        if p.returncode != 0:
+            raise GitError(stderr, p.returncode)
         return stdout.decode('utf-8').splitlines()
 
 
+class GitError(Exception):
+    def __init__(self, message, status):
+        super(GitError, self).__init__(message)
+
+        self.status = status
+
+
 if __name__ == '__main__':
     try:
         main()
diff -Nru ansible-2.4.1.0/test/units/cli/test_cli.py ansible-2.4.2.0/test/units/cli/test_cli.py
--- ansible-2.4.1.0/test/units/cli/test_cli.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/cli/test_cli.py	2017-11-29 21:10:32.000000000 +0000
@@ -46,6 +46,13 @@
 
 
 class TestCliBuildVaultIds(unittest.TestCase):
+    def setUp(self):
+        self.tty_patcher = patch('ansible.cli.sys.stdin.isatty', return_value=True)
+        self.mock_isatty = self.tty_patcher.start()
+
+    def tearDown(self):
+        self.tty_patcher.stop()
+
     def test(self):
         res = cli.CLI.build_vault_ids(['foo@bar'])
         self.assertEqual(res, ['foo@bar'])
@@ -102,6 +109,7 @@
                                       ask_vault_pass=True,
                                       create_new_password=True,
                                       auto_prompt=False)
+
         self.assertEqual(set(res), set(['blip@prompt', 'baz@prompt_ask_vault_pass',
                                         'default@prompt_ask_vault_pass',
                                         'some-password-file', 'qux@another-password-file',
@@ -115,8 +123,14 @@
         self.tty_patcher = patch('ansible.cli.sys.stdin.isatty', return_value=True)
         self.mock_isatty = self.tty_patcher.start()
 
+        self.display_v_patcher = patch('ansible.cli.display.verbosity', return_value=6)
+        self.mock_display_v = self.display_v_patcher.start()
+        cli.display.verbosity = 5
+
     def tearDown(self):
         self.tty_patcher.stop()
+        self.display_v_patcher.stop()
+        cli.display.verbosity = 0
 
     def test(self):
         res = cli.CLI.setup_vault_secrets(None, None, auto_prompt=False)
@@ -144,7 +158,8 @@
 
         res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
                                           vault_ids=['prompt1@prompt'],
-                                          ask_vault_pass=True)
+                                          ask_vault_pass=True,
+                                          auto_prompt=False)
 
         self.assertIsInstance(res, list)
         matches = vault.match_secrets(res, ['prompt1'])
@@ -156,15 +171,19 @@
     def test_prompt_no_tty(self, mock_prompt_secret):
         self.mock_isatty.return_value = False
         mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
-                                                    vault_id='prompt1')
+                                                    vault_id='prompt1',
+                                                    name='bytes_should_be_prompt1_password',
+                                                    spec=vault.PromptVaultSecret)
         res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
                                           vault_ids=['prompt1@prompt'],
-                                          ask_vault_pass=True)
+                                          ask_vault_pass=True,
+                                          auto_prompt=False)
 
         self.assertIsInstance(res, list)
-        self.assertEqual(len(res), 0)
+        self.assertEqual(len(res), 2)
         matches = vault.match_secrets(res, ['prompt1'])
-        self.assertEquals(len(matches), 0)
+        self.assertIn('prompt1', [x[0] for x in matches])
+        self.assertEquals(len(matches), 1)
 
     @patch('ansible.cli.get_file_vault_secret')
     @patch('ansible.cli.PromptVaultSecret')
@@ -192,7 +211,7 @@
         self.assertIsInstance(res, list)
         len_ids = len(vault_id_names)
         matches = vault.match_secrets(res, vault_id_names)
-        self.assertEqual(len(res), len_ids)
+        self.assertEqual(len(res), len_ids, 'len(res):%s does not match len_ids:%s' % (len(res), len_ids))
         self.assertEqual(len(matches), len_ids)
         for index, prompt in enumerate(vault_id_names):
             self.assertIn(prompt, [x[0] for x in matches])
@@ -214,6 +233,7 @@
 
     @patch('ansible.cli.PromptVaultSecret')
     def test_multiple_prompts_and_ask_vault_pass(self, mock_prompt_secret):
+        self.mock_isatty.return_value = False
         mock_prompt_secret.return_value = MagicMock(bytes=b'prompt1_password',
                                                     vault_id='prompt1')
 
@@ -223,6 +243,8 @@
                                                      'prompt3@prompt_ask_vault_pass'],
                                           ask_vault_pass=True)
 
+        # We provide some vault-ids and secrets, so auto_prompt shouldn't get triggered,
+        # so there is
         vault_id_names = ['prompt1', 'prompt2', 'prompt3', 'default']
         self._assert_ids(vault_id_names, res)
 
@@ -242,14 +264,27 @@
         res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
                                           vault_ids=[],
                                           create_new_password=False,
-                                          ask_vault_pass=True)
+                                          ask_vault_pass=False)
 
         self.assertIsInstance(res, list)
         matches = vault.match_secrets(res, ['default'])
         # --vault-password-file/DEFAULT_VAULT_PASSWORD_FILE is higher precendce than prompts
         # if the same vault-id ('default') regardless of cli order since it didn't matter in 2.3
+
+        self.assertEqual(matches[0][1].bytes, b'file1_password')
+        self.assertEqual(len(matches), 1)
+
+        res = cli.CLI.setup_vault_secrets(loader=self.fake_loader,
+                                          vault_ids=[],
+                                          create_new_password=False,
+                                          ask_vault_pass=True,
+                                          auto_prompt=True)
+
+        self.assertIsInstance(res, list)
+        matches = vault.match_secrets(res, ['default'])
         self.assertEqual(matches[0][1].bytes, b'file1_password')
         self.assertEqual(matches[1][1].bytes, b'prompt1_password')
+        self.assertEqual(len(matches), 2)
 
     @patch('ansible.cli.get_file_vault_secret')
     @patch('ansible.cli.PromptVaultSecret')
diff -Nru ansible-2.4.1.0/test/units/cli/test_vault.py ansible-2.4.2.0/test/units/cli/test_vault.py
--- ansible-2.4.1.0/test/units/cli/test_vault.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/cli/test_vault.py	2017-11-29 21:10:32.000000000 +0000
@@ -32,6 +32,13 @@
 
 
 class TestVaultCli(unittest.TestCase):
+    def setUp(self):
+        self.tty_patcher = patch('ansible.cli.sys.stdin.isatty', return_value=False)
+        self.mock_isatty = self.tty_patcher.start()
+
+    def tearDown(self):
+        self.tty_patcher.stop()
+
     def test_parse_empty(self):
         cli = VaultCLI([])
         self.assertRaisesRegexp(errors.AnsibleOptionsError,
@@ -46,14 +53,18 @@
         cli = VaultCLI(args=['ansible-vault', 'view', '/dev/null/foo'])
         cli.parse()
 
-    def test_view_missing_file_no_secret(self):
+    @patch('ansible.cli.vault.VaultCLI.setup_vault_secrets')
+    def test_view_missing_file_no_secret(self, mock_setup_vault_secrets):
+        mock_setup_vault_secrets.return_value = []
         cli = VaultCLI(args=['ansible-vault', 'view', '/dev/null/foo'])
         cli.parse()
         self.assertRaisesRegexp(errors.AnsibleOptionsError,
                                 "A vault password is required to use Ansible's Vault",
                                 cli.run)
 
-    def test_encrypt_missing_file_no_secret(self):
+    @patch('ansible.cli.vault.VaultCLI.setup_vault_secrets')
+    def test_encrypt_missing_file_no_secret(self, mock_setup_vault_secrets):
+        mock_setup_vault_secrets.return_value = []
         cli = VaultCLI(args=['ansible-vault', 'encrypt', '/dev/null/foo'])
         cli.parse()
         self.assertRaisesRegexp(errors.AnsibleOptionsError,
diff -Nru ansible-2.4.1.0/test/units/executor/test_task_result.py ansible-2.4.2.0/test/units/executor/test_task_result.py
--- ansible-2.4.1.0/test/units/executor/test_task_result.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/executor/test_task_result.py	2017-11-29 21:10:32.000000000 +0000
@@ -138,3 +138,12 @@
         # test with failed_when in result
         tr = TaskResult(mock_host, mock_task, dict(failed_when_result=True))
         self.assertTrue(tr.is_failed())
+
+    def test_task_result_no_log(self):
+        mock_host = MagicMock()
+        mock_task = MagicMock()
+
+        # no_log should remove secrets
+        tr = TaskResult(mock_host, mock_task, dict(_ansible_no_log=True, secret='DONTSHOWME'))
+        clean = tr.clean_copy()
+        self.assertTrue('secret' not in clean._result)
diff -Nru ansible-2.4.1.0/test/units/modules/network/eos/test_eos_eapi.py ansible-2.4.2.0/test/units/modules/network/eos/test_eos_eapi.py
--- ansible-2.4.1.0/test/units/modules/network/eos/test_eos_eapi.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/eos/test_eos_eapi.py	2017-11-29 21:10:32.000000000 +0000
@@ -134,6 +134,11 @@
         commands = ['management api http-commands', 'vrf test', 'no shutdown']
         self.start_unconfigured(changed=True, commands=commands)
 
+    def test_eos_eapi_change_from_default_vrf(self):
+        set_module_args(dict(vrf='test'))
+        commands = ['management api http-commands', 'vrf test', 'no shutdown']
+        self.start_configured(changed=True, commands=commands)
+
     def test_eos_eapi_vrf_missing(self):
         set_module_args(dict(vrf='missing'))
         self.start_unconfigured(failed=True)
diff -Nru ansible-2.4.1.0/test/units/modules/network/ios/fixtures/ios_logging_config.cfg ansible-2.4.2.0/test/units/modules/network/ios/fixtures/ios_logging_config.cfg
--- ansible-2.4.1.0/test/units/modules/network/ios/fixtures/ios_logging_config.cfg	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/ios/fixtures/ios_logging_config.cfg	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,10 @@
+!
+logging buffered 5000
+logging console informational
+logging facility local0
+logging host 1.2.3.4 transport tcp
+logging host 1.2.3.4
+logging host 2.3.4.5
+logging host 1.2.3.4 transport tcp port 1000
+logging host 1.2.3.4 transport udp port 1000
+!
diff -Nru ansible-2.4.1.0/test/units/modules/network/ios/test_ios_config.py ansible-2.4.2.0/test/units/modules/network/ios/test_ios_config.py
--- ansible-2.4.1.0/test/units/modules/network/ios/test_ios_config.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/ios/test_ios_config.py	2017-11-29 21:10:32.000000000 +0000
@@ -76,7 +76,7 @@
         self.assertEqual(self.get_config.call_count, 0)
         self.assertEqual(self.load_config.call_count, 0)
         args = self.run_commands.call_args[0][1]
-        self.assertIn('copy running-config startup-config', args)
+        self.assertIn('copy running-config startup-config\r', args)
 
     def test_ios_config_lines_wo_parents(self):
         set_module_args(dict(lines=['hostname foo']))
diff -Nru ansible-2.4.1.0/test/units/modules/network/ios/test_ios_logging.py ansible-2.4.2.0/test/units/modules/network/ios/test_ios_logging.py
--- ansible-2.4.1.0/test/units/modules/network/ios/test_ios_logging.py	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/ios/test_ios_logging.py	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,58 @@
+#
+# (c) 2016 Red Hat Inc.
+# (c) 2017 Paul Neumann
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import json
+
+from ansible.compat.tests.mock import patch
+from ansible.modules.network.ios import ios_logging
+from .ios_module import TestIosModule, load_fixture, set_module_args
+
+
+class TestIosLoggingModule(TestIosModule):
+
+    module = ios_logging
+
+    def setUp(self):
+        self.mock_get_config = patch('ansible.modules.network.ios.ios_logging.get_config')
+        self.get_config = self.mock_get_config.start()
+
+        self.mock_load_config = patch('ansible.modules.network.ios.ios_logging.load_config')
+        self.load_config = self.mock_load_config.start()
+
+    def tearDown(self):
+        self.mock_get_config.stop()
+        self.mock_load_config.stop()
+
+    def load_fixtures(self, commands=None):
+        self.get_config.return_value = load_fixture('ios_logging_config.cfg')
+        self.load_config.return_value = None
+
+    def test_ios_logging_buffer_size_changed_implicit(self):
+        set_module_args(dict(dest='buffered'))
+        commands = ['logging buffered 4096']
+        self.execute_module(changed=True, commands=commands)
+
+    def test_ios_logging_buffer_size_changed_explicit(self):
+        set_module_args(dict(dest='buffered', size=6000))
+        commands = ['logging buffered 6000']
+        self.execute_module(changed=True, commands=commands)
diff -Nru ansible-2.4.1.0/test/units/modules/network/ios/test_ios_system.py ansible-2.4.2.0/test/units/modules/network/ios/test_ios_system.py
--- ansible-2.4.1.0/test/units/modules/network/ios/test_ios_system.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/ios/test_ios_system.py	2017-11-29 21:10:32.000000000 +0000
@@ -42,7 +42,7 @@
         self.mock_get_config.stop()
         self.mock_load_config.stop()
 
-    def load_fixtures(self, commnads=None):
+    def load_fixtures(self, commands=None):
         self.get_config.return_value = load_fixture('ios_system_config.cfg')
         self.load_config.return_value = None
 
diff -Nru ansible-2.4.1.0/test/units/modules/network/nxos/fixtures/nxos_interface/show_interface ansible-2.4.2.0/test/units/modules/network/nxos/fixtures/nxos_interface/show_interface
--- ansible-2.4.1.0/test/units/modules/network/nxos/fixtures/nxos_interface/show_interface	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/nxos/fixtures/nxos_interface/show_interface	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,846 @@
+{
+  "TABLE_interface": {
+    "ROW_interface": [
+      {
+        "interface": "mgmt0", 
+        "state": "up", 
+        "admin_state": "up", 
+        "eth_hw_desc": "GigabitEthernet", 
+        "eth_hw_addr": "e4c7.220c.4fe5", 
+        "eth_bia_addr": "e4c7.220c.4fe5", 
+        "eth_ip_addr": "10.122.84.99", 
+        "eth_ip_mask": 24, 
+        "eth_ip_prefix": "10.122.84.0", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "full", 
+        "eth_speed": "1000 Mb/s", 
+        "eth_autoneg": "on", 
+        "eth_mdix": "off", 
+        "eth_ethertype": "0x0000", 
+        "vdc_lvl_in_avg_bytes": 47448, 
+        "vdc_lvl_in_avg_pkts": 60, 
+        "vdc_lvl_out_avg_bytes": 184968, 
+        "vdc_lvl_out_avg_pkts": 59, 
+        "vdc_lvl_in_pkts": 350043, 
+        "vdc_lvl_in_ucast": 344955, 
+        "vdc_lvl_in_mcast": 4700, 
+        "vdc_lvl_in_bcast": 388, 
+        "vdc_lvl_in_bytes": 108044389, 
+        "vdc_lvl_out_pkts": 212806, 
+        "vdc_lvl_out_ucast": 212606, 
+        "vdc_lvl_out_mcast": 192, 
+        "vdc_lvl_out_bcast": 8, 
+        "vdc_lvl_out_bytes": 75961919, 
+        "mgmt_in_pkts": 360175, 
+        "mgmt_in_bytes": 108055870, 
+        "mgmt_in_mcast": 11091, 
+        "mgmt_in_compressed": 0, 
+        "mgmt_in_errors": 0, 
+        "mgmt_in_frame": 0, 
+        "mgmt_in_overrun": 4072, 
+        "mgmt_in_fifo": 0, 
+        "mgmt_out_pkts": 212757, 
+        "mgmt_out_bytes": 75100855, 
+        "mgmt_out_underruns": 0, 
+        "mgmt_out_errors": 0, 
+        "mgmt_out_collisions": 0, 
+        "mgmt_out_fifo": 0, 
+        "mgmt_out_carrier": 0
+      }, 
+      {
+        "interface": "Ethernet2/1", 
+        "state": "down", 
+        "state_rsn_desc": "Administratively down", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "c84c.75fc.7c70", 
+        "eth_bia_addr": "c84c.75fc.7c70", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "access", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_media": "1G", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_ratemode": "dedicated", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/2", 
+        "state": "down", 
+        "state_rsn_desc": "Administratively down", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c71", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_media": "1G", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_ratemode": "dedicated", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/3", 
+        "state": "down", 
+        "state_rsn_desc": "Administratively down", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c72", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_media": "1G", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_ratemode": "dedicated", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/4", 
+        "state": "down", 
+        "state_rsn_desc": "Administratively down", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c73", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_media": "1G", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_ratemode": "dedicated", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/5", 
+        "state": "down", 
+        "state_rsn_desc": "Administratively down", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c74", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_media": "1G", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_ratemode": "dedicated", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/6", 
+        "state": "down", 
+        "state_rsn_desc": "SFP not inserted", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c75", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/7", 
+        "state": "down", 
+        "state_rsn_desc": "SFP not inserted", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c76", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }, 
+      {
+        "interface": "Ethernet2/8", 
+        "state": "down", 
+        "state_rsn_desc": "SFP not inserted", 
+        "admin_state": "down", 
+        "share_state": "Dedicated", 
+        "eth_hw_desc": "1000 Ethernet", 
+        "eth_hw_addr": "0026.980b.1041", 
+        "eth_bia_addr": "c84c.75fc.7c77", 
+        "eth_mtu": "1500", 
+        "eth_bw": 1000000, 
+        "eth_dly": 10, 
+        "eth_reliability": "255", 
+        "eth_txload": "1", 
+        "eth_rxload": "1", 
+        "eth_encap": "ARPA", 
+        "medium": "broadcast", 
+        "eth_mode": "routed", 
+        "eth_duplex": "auto", 
+        "eth_speed": "auto-speed", 
+        "eth_beacon": "off", 
+        "eth_autoneg": "on", 
+        "eth_in_flowctrl": "off", 
+        "eth_out_flowctrl": "off", 
+        "eth_mdix": "off", 
+        "eth_swt_monitor": "off", 
+        "eth_ethertype": "0x8100", 
+        "eth_eee_state": "n/a", 
+        "eth_link_flapped": "never", 
+        "eth_clear_counters": "00:15:20", 
+        "eth_reset_cntr": 0, 
+        "eth_load_interval1_rx": 30, 
+        "eth_inrate1_bits": 0, 
+        "eth_inrate1_pkts": 0, 
+        "eth_load_interval1_tx": 30, 
+        "eth_outrate1_bits": 0, 
+        "eth_outrate1_pkts": 0, 
+        "eth_inrate1_summary_bits": "0 bps", 
+        "eth_inrate1_summary_pkts": "0 pps", 
+        "eth_outrate1_summary_bits": "0 bps", 
+        "eth_outrate1_summary_pkts": "0 pps", 
+        "eth_load_interval2_rx": 300, 
+        "eth_inrate2_bits": 0, 
+        "eth_inrate2_pkts": 0, 
+        "eth_load_interval2_tx": 300, 
+        "eth_outrate2_bits": 0, 
+        "eth_outrate2_pkts": 0, 
+        "eth_inrate2_summary_bits": "0 bps", 
+        "eth_inrate2_summary_pkts": "0 pps", 
+        "eth_outrate2_summary_bits": "0 bps", 
+        "eth_outrate2_summary_pkts": "0 pps", 
+        "eth_l3in_ucastpkts": 0, 
+        "eth_l3in_ucastbytes": 0, 
+        "eth_l3in_mcastpkts": 0, 
+        "eth_l3in_mcastbytes": 0, 
+        "eth_l3out_ucastpkts": 0, 
+        "eth_l3out_ucastbytes": 0, 
+        "eth_l3out_mcastpkts": 0, 
+        "eth_l3out_mcastbytes": 0, 
+        "eth_inucast": 4, 
+        "eth_inmcast": 0, 
+        "eth_inbcast": 0, 
+        "eth_inpkts": 4, 
+        "eth_inbytes": 2496, 
+        "eth_jumbo_inpkts": 0, 
+        "eth_storm_supp": 0, 
+        "eth_runts": 0, 
+        "eth_giants": 0, 
+        "eth_crc": 0, 
+        "eth_nobuf": 0, 
+        "eth_inerr": 0, 
+        "eth_frame": 0, 
+        "eth_overrun": 0, 
+        "eth_underrun": 0, 
+        "eth_ignored": 0, 
+        "eth_watchdog": 0, 
+        "eth_bad_eth": 0, 
+        "eth_bad_proto": 0, 
+        "eth_in_ifdown_drops": 0, 
+        "eth_dribble": 0, 
+        "eth_indiscard": 0, 
+        "eth_inpause": 0, 
+        "eth_outucast": 4, 
+        "eth_outmcast": 0, 
+        "eth_outbcast": 0, 
+        "eth_outpkts": 4, 
+        "eth_outbytes": 2496, 
+        "eth_jumbo_outpkts": 0, 
+        "eth_outerr": 0, 
+        "eth_coll": 0, 
+        "eth_deferred": 0, 
+        "eth_latecoll": 0, 
+        "eth_lostcarrier": 0, 
+        "eth_nocarrier": 0, 
+        "eth_babbles": 0, 
+        "eth_outdiscard": 0, 
+        "eth_outpause": 0
+      }
+    ]
+  }
+}
diff -Nru ansible-2.4.1.0/test/units/modules/network/nxos/test_nxos_banner.py ansible-2.4.2.0/test/units/modules/network/nxos/test_nxos_banner.py
--- ansible-2.4.1.0/test/units/modules/network/nxos/test_nxos_banner.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/modules/network/nxos/test_nxos_banner.py	2017-11-29 21:10:32.000000000 +0000
@@ -42,12 +42,42 @@
     def load_fixtures(self, commands=None, device=''):
         self.load_config.return_value = dict(diff=None, session='session')
 
-    def test_nxos_banner_create(self):
+    def test_nxos_banner_exec_create(self):
         set_module_args(dict(banner='exec', text='test\nbanner\nstring'))
         commands = ['banner exec @\ntest\nbanner\nstring\n@']
+        self.run_commands.return_value = commands
         self.execute_module(changed=True, commands=commands)
 
-    def test_nxos_banner_remove(self):
+    def test_nxos_banner_exec_remove(self):
         set_module_args(dict(banner='exec', state='absent'))
         commands = ['no banner exec']
+        self.run_commands.return_value = commands
+        self.execute_module(changed=True, commands=commands)
+
+    def test_nxos_banner_exec_fail_create(self):
+        set_module_args(dict(banner='exec', text='test\nbanner\nstring'))
+        commands = ['banner exec @\ntest\nbanner\nstring\n@']
+        err_rsp = ['Invalid command']
+        self.run_commands.return_value = err_rsp
+        result = self.execute_module(failed=True, changed=True)
+        self.assertEqual(result['msg'], 'banner: exec may not be supported on this platform.  Possible values are : exec | motd')
+
+    def test_nxos_banner_exec_fail_remove(self):
+        set_module_args(dict(banner='exec', state='absent'))
+        commands = ['no banner exec']
+        err_rsp = ['Invalid command']
+        self.run_commands.return_value = err_rsp
+        result = self.execute_module(failed=True, changed=True)
+        self.assertEqual(result['msg'], 'banner: exec may not be supported on this platform.  Possible values are : exec | motd')
+
+    def test_nxos_banner_motd_create(self):
+        set_module_args(dict(banner='motd', text='test\nbanner\nstring'))
+        commands = ['banner motd @\ntest\nbanner\nstring\n@']
+        self.run_commands.return_value = commands
+        self.execute_module(changed=True, commands=commands)
+
+    def test_nxos_banner_motd_remove(self):
+        set_module_args(dict(banner='motd', state='absent'))
+        commands = ['no banner motd']
+        self.run_commands.return_value = commands
         self.execute_module(changed=True, commands=commands)
diff -Nru ansible-2.4.1.0/test/units/module_utils/test_basic.py ansible-2.4.2.0/test/units/module_utils/test_basic.py
--- ansible-2.4.1.0/test/units/module_utils/test_basic.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/module_utils/test_basic.py	2017-11-29 21:10:32.000000000 +0000
@@ -85,7 +85,9 @@
             if name == 'json':
                 raise ImportError
             elif name == 'simplejson':
-                return MagicMock()
+                sj = MagicMock()
+                sj.__version__ = '3.10.0'
+                return sj
             return realimport(name, *args, **kwargs)
 
         self.clear_modules(['json', 'ansible.module_utils.basic'])
diff -Nru ansible-2.4.1.0/test/units/parsing/vault/test_vault.py ansible-2.4.2.0/test/units/parsing/vault/test_vault.py
--- ansible-2.4.1.0/test/units/parsing/vault/test_vault.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/parsing/vault/test_vault.py	2017-11-29 21:10:32.000000000 +0000
@@ -41,6 +41,62 @@
 from units.mock.vault_helper import TextVaultSecret
 
 
+class TestUnhexlify(unittest.TestCase):
+    def test(self):
+        b_plain_data = b'some text to hexlify'
+        b_data = hexlify(b_plain_data)
+        res = vault._unhexlify(b_data)
+        self.assertEquals(res, b_plain_data)
+
+    def test_odd_length(self):
+        b_data = b'123456789abcdefghijklmnopqrstuvwxyz'
+
+        self.assertRaisesRegexp(vault.AnsibleVaultFormatError,
+                                '.*Vault format unhexlify error.*',
+                                vault._unhexlify,
+                                b_data)
+
+    def test_nonhex(self):
+        b_data = b'6z36316566653264333665333637623064303639353237620a636366633565663263336335656532'
+
+        self.assertRaisesRegexp(vault.AnsibleVaultFormatError,
+                                '.*Vault format unhexlify error.*Non-hexadecimal digit found',
+                                vault._unhexlify,
+                                b_data)
+
+
+class TestParseVaulttext(unittest.TestCase):
+    def test(self):
+        vaulttext_envelope = u'''$ANSIBLE_VAULT;1.1;AES256
+33363965326261303234626463623963633531343539616138316433353830356566396130353436
+3562643163366231316662386565383735653432386435610a306664636137376132643732393835
+63383038383730306639353234326630666539346233376330303938323639306661313032396437
+6233623062366136310a633866373936313238333730653739323461656662303864663666653563
+3138'''
+
+        b_vaulttext_envelope = to_bytes(vaulttext_envelope, errors='strict', encoding='utf-8')
+        b_vaulttext, b_version, cipher_name, vault_id = vault.parse_vaulttext_envelope(b_vaulttext_envelope)
+        res = vault.parse_vaulttext(b_vaulttext)
+        self.assertIsInstance(res[0], bytes)
+        self.assertIsInstance(res[1], bytes)
+        self.assertIsInstance(res[2], bytes)
+
+    def test_non_hex(self):
+        vaulttext_envelope = u'''$ANSIBLE_VAULT;1.1;AES256
+3336396J326261303234626463623963633531343539616138316433353830356566396130353436
+3562643163366231316662386565383735653432386435610a306664636137376132643732393835
+63383038383730306639353234326630666539346233376330303938323639306661313032396437
+6233623062366136310a633866373936313238333730653739323461656662303864663666653563
+3138'''
+
+        b_vaulttext_envelope = to_bytes(vaulttext_envelope, errors='strict', encoding='utf-8')
+        b_vaulttext, b_version, cipher_name, vault_id = vault.parse_vaulttext_envelope(b_vaulttext_envelope)
+        self.assertRaisesRegexp(vault.AnsibleVaultFormatError,
+                                '.*Vault format unhexlify error.*Non-hexadecimal digit found',
+                                vault.parse_vaulttext,
+                                b_vaulttext_envelope)
+
+
 class TestVaultSecret(unittest.TestCase):
     def test(self):
         secret = vault.VaultSecret()
diff -Nru ansible-2.4.1.0/test/units/playbook/role/test_include_role.py ansible-2.4.2.0/test/units/playbook/role/test_include_role.py
--- ansible-2.4.1.0/test/units/playbook/role/test_include_role.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/playbook/role/test_include_role.py	2017-11-29 21:10:32.000000000 +0000
@@ -23,6 +23,7 @@
 from ansible.compat.tests.mock import patch
 
 from ansible.playbook import Play
+from ansible.playbook.role_include import IncludeRole
 from ansible.playbook.task import Task
 from ansible.vars.manager import VariableManager
 
@@ -30,15 +31,6 @@
 from units.mock.path import mock_unfrackpath_noop
 
 
-def flatten_tasks(tasks):
-    for task in tasks:
-        if isinstance(task, Task):
-            yield task
-        else:
-            for t in flatten_tasks(task.block):
-                yield t
-
-
 class TestIncludeRole(unittest.TestCase):
 
     def setUp(self):
@@ -97,8 +89,21 @@
     def tearDown(self):
         pass
 
+    def flatten_tasks(self, tasks):
+        for task in tasks:
+            if isinstance(task, IncludeRole):
+                blocks, handlers = task.get_block_list(loader=self.loader)
+                for block in blocks:
+                    for t in self.flatten_tasks(block.block):
+                        yield t
+            elif isinstance(task, Task):
+                yield task
+            else:
+                for t in self.flatten_tasks(task.block):
+                    yield t
+
     def get_tasks_vars(self, play, tasks):
-        for task in flatten_tasks(tasks):
+        for task in self.flatten_tasks(tasks):
             role = task._role
             if not role:
                 continue
@@ -122,9 +127,12 @@
         ), loader=self.loader, variable_manager=self.var_manager)
 
         tasks = play.compile()
+        tested = False
         for role, task_vars in self.get_tasks_vars(play, tasks):
+            tested = True
             self.assertEqual(task_vars.get('l3_variable'), 'l3-main')
             self.assertEqual(task_vars.get('test_variable'), 'l3-main')
+        self.assertTrue(tested)
 
     @patch('ansible.playbook.role.definition.unfrackpath',
            mock_unfrackpath_noop)
@@ -140,9 +148,12 @@
             loader=self.loader, variable_manager=self.var_manager)
 
         tasks = play.compile()
+        tested = False
         for role, task_vars in self.get_tasks_vars(play, tasks):
+            tested = True
             self.assertEqual(task_vars.get('l3_variable'), 'l3-alt')
             self.assertEqual(task_vars.get('test_variable'), 'l3-alt')
+        self.assertTrue(tested)
 
     @patch('ansible.playbook.role.definition.unfrackpath',
            mock_unfrackpath_noop)
@@ -165,7 +176,9 @@
         ), loader=self.loader, variable_manager=self.var_manager)
 
         tasks = play.compile()
+        expected_roles = ['l1', 'l2', 'l3']
         for role, task_vars in self.get_tasks_vars(play, tasks):
+            expected_roles.remove(role)
             # Outer-most role must not have variables from inner roles yet
             if role == 'l1':
                 self.assertEqual(task_vars.get('l1_variable'), 'l1-main')
@@ -184,6 +197,9 @@
                 self.assertEqual(task_vars.get('l2_variable'), 'l2-main')
                 self.assertEqual(task_vars.get('l3_variable'), 'l3-main')
                 self.assertEqual(task_vars.get('test_variable'), 'l3-main')
+            else:
+                self.fail()
+        self.assertFalse(expected_roles)
 
     @patch('ansible.playbook.role.definition.unfrackpath',
            mock_unfrackpath_noop)
@@ -206,7 +222,9 @@
         ), loader=self.loader, variable_manager=self.var_manager)
 
         tasks = play.compile()
+        expected_roles = ['l1', 'l2', 'l3']
         for role, task_vars in self.get_tasks_vars(play, tasks):
+            expected_roles.remove(role)
             # Outer-most role must not have variables from inner roles yet
             if role == 'l1':
                 self.assertEqual(task_vars.get('l1_variable'), 'l1-alt')
@@ -225,3 +243,6 @@
                 self.assertEqual(task_vars.get('l2_variable'), 'l2-alt')
                 self.assertEqual(task_vars.get('l3_variable'), 'l3-alt')
                 self.assertEqual(task_vars.get('test_variable'), 'l3-alt')
+            else:
+                self.fail()
+        self.assertFalse(expected_roles)
diff -Nru ansible-2.4.1.0/test/units/plugins/callback/test_callback.py ansible-2.4.2.0/test/units/plugins/callback/test_callback.py
--- ansible-2.4.1.0/test/units/plugins/callback/test_callback.py	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/units/plugins/callback/test_callback.py	2017-11-29 21:10:32.000000000 +0000
@@ -93,16 +93,6 @@
         self.assertFalse('SENTINEL' in json_out)
         self.assertTrue('LEFTIN' in json_out)
 
-    def test_no_log(self):
-        cb = CallbackBase()
-        result = {'item': 'some_item',
-                  '_ansible_no_log': True,
-                  'some_secrets': 'SENTINEL'}
-        json_out = cb._dump_results(result)
-        self.assertFalse('SENTINEL' in json_out)
-        self.assertTrue('no_log' in json_out)
-        self.assertTrue('output has been hidden' in json_out)
-
     def test_exception(self):
         cb = CallbackBase()
         result = {'item': 'some_item LEFTIN',
diff -Nru ansible-2.4.1.0/test/units/plugins/inventory/test_script.py ansible-2.4.2.0/test/units/plugins/inventory/test_script.py
--- ansible-2.4.1.0/test/units/plugins/inventory/test_script.py	1970-01-01 00:00:00.000000000 +0000
+++ ansible-2.4.2.0/test/units/plugins/inventory/test_script.py	2017-11-29 21:10:32.000000000 +0000
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2017 Chris Meyers <cmeyers@ansible.com>
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import pytest
+
+from ansible.errors import AnsibleError
+from ansible.compat.tests import mock
+from ansible.compat.tests import unittest
+from ansible.module_utils._text import to_bytes, to_native
+
+from ansible.plugins.inventory.script import InventoryModule
+
+
+class TestInventoryModule(unittest.TestCase):
+
+    def setUp(self):
+        class Inventory():
+            cache = dict()
+
+        class PopenResult():
+            returncode = 0
+            stdout = b""
+            stderr = b""
+
+            def communicate(self):
+                return (self.stdout, self.stderr)
+
+        self.popen_result = PopenResult()
+        self.inventory = Inventory()
+        self.loader = mock.MagicMock()
+        self.loader.load = mock.MagicMock()
+
+        def register_patch(name):
+            patcher = mock.patch(name)
+            self.addCleanup(patcher.stop)
+            return patcher.start()
+
+        self.popen = register_patch('subprocess.Popen')
+        self.popen.return_value = self.popen_result
+
+        self.BaseInventoryPlugin = register_patch('ansible.plugins.inventory.BaseInventoryPlugin')
+        self.BaseInventoryPlugin.get_cache_prefix.return_value = 'abc123'
+
+    def test_parse_subprocess_path_not_found_fail(self):
+        self.popen.side_effect = OSError("dummy text")
+
+        inventory_module = InventoryModule()
+        with pytest.raises(AnsibleError) as e:
+            inventory_module.parse(self.inventory, self.loader, '/foo/bar/foobar.py')
+        assert e.value.message == "problem running /foo/bar/foobar.py --list (dummy text)"
+
+    def test_parse_subprocess_err_code_fail(self):
+        self.popen_result.stdout = to_bytes(u"fooébar", errors='surrogate_escape')
+        self.popen_result.stderr = to_bytes(u"dummyédata")
+
+        self.popen_result.returncode = 1
+
+        inventory_module = InventoryModule()
+        with pytest.raises(AnsibleError) as e:
+            inventory_module.parse(self.inventory, self.loader, '/foo/bar/foobar.py')
+        assert e.value.message == to_native("Inventory script (/foo/bar/foobar.py) had an execution error: "
+                                            "dummyédata\n ")
+
+    def test_parse_utf8_fail(self):
+        self.popen_result.returncode = 0
+        self.popen_result.stderr = to_bytes("dummyédata")
+        self.loader.load.side_effect = TypeError('obj must be string')
+
+        inventory_module = InventoryModule()
+        with pytest.raises(AnsibleError) as e:
+            inventory_module.parse(self.inventory, self.loader, '/foo/bar/foobar.py')
+        assert e.value.message == to_native("failed to parse executable inventory script results from "
+                                            "/foo/bar/foobar.py: obj must be string\ndummyédata\n")
+
+    def test_parse_dict_fail(self):
+        self.popen_result.returncode = 0
+        self.popen_result.stderr = to_bytes("dummyédata")
+        self.loader.load.return_value = 'i am not a dict'
+
+        inventory_module = InventoryModule()
+        with pytest.raises(AnsibleError) as e:
+            inventory_module.parse(self.inventory, self.loader, '/foo/bar/foobar.py')
+        assert e.value.message == to_native("failed to parse executable inventory script results from "
+                                            "/foo/bar/foobar.py: needs to be a json dict\ndummyédata\n")
diff -Nru ansible-2.4.1.0/test/utils/shippable/cloud.sh ansible-2.4.2.0/test/utils/shippable/cloud.sh
--- ansible-2.4.1.0/test/utils/shippable/cloud.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/utils/shippable/cloud.sh	2017-11-29 21:10:32.000000000 +0000
@@ -6,8 +6,9 @@
 IFS='/:' read -ra args <<< "$1"
 
 image="${args[1]}"
-target="posix/ci/cloud/group${args[2]}/"
+python="${args[2]}"
+target="posix/ci/cloud/group${args[3]}/"
 
 # shellcheck disable=SC2086
 ansible-test integration --color -v --retry-on-error "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
-    --docker "${image}" --changed-all-target "${target}smoketest/"
+    --docker "${image}" --python "${python}" --changed-all-target "${target}smoketest/"
diff -Nru ansible-2.4.1.0/test/utils/shippable/network.sh ansible-2.4.2.0/test/utils/shippable/network.sh
--- ansible-2.4.1.0/test/utils/shippable/network.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/utils/shippable/network.sh	2017-11-29 21:10:32.000000000 +0000
@@ -15,7 +15,10 @@
 # python versions to test in order
 # all versions run full tests
 python_versions=(
+    2.6
     2.7
+    3.5
+    3.6
 )
 
 if [ -s /tmp/network.txt ]; then
@@ -25,7 +28,7 @@
     echo "Running network integration tests for multiple platforms concurrently."
 
     platforms=(
-        --platform vyos/1.1.0
+        --platform vyos/1.1.8
         --platform ios/csr1000v
     )
 else
@@ -33,17 +36,19 @@
     echo "Running network integration tests for a single platform only."
 
     platforms=(
-        --platform vyos/1.1.0
+        --platform vyos/1.1.8
     )
 fi
 
-retry.py pip install tox --disable-pip-version-check
-
 for version in "${python_versions[@]}"; do
-    # clean up between test runs until we switch from --tox to --docker
-    rm -rf ~/.ansible/{cp,pc,tmp}/
+    # terminate remote instances on the final python version tested
+    if [ "${version}" = "${python_versions[-1]}" ]; then
+        terminate="always"
+    else
+        terminate="never"
+    fi
 
     # shellcheck disable=SC2086
-    ansible-test network-integration --color -v --retry-on-error "${target}" --tox --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
-        "${platforms[@]}"
+    ansible-test network-integration --color -v --retry-on-error "${target}" --docker default --python "${version}" \
+        ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} "${platforms[@]}" --remote-terminate "${terminate}"
 done
diff -Nru ansible-2.4.1.0/test/utils/shippable/other.sh ansible-2.4.2.0/test/utils/shippable/other.sh
--- ansible-2.4.1.0/test/utils/shippable/other.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/utils/shippable/other.sh	2017-11-29 21:10:32.000000000 +0000
@@ -4,20 +4,17 @@
 
 shippable.py
 
-retry.py apt-get update -qq
-retry.py apt-get install -qq \
-    shellcheck \
-
-retry.py pip install tox --disable-pip-version-check
-
 echo '{"verified": false, "results": []}' > test/results/bot/ansible-test-failure.json
 
+if [ "${BASE_BRANCH:-}" ]; then
+    base_branch="origin/${BASE_BRANCH}"
+else
+    base_branch=""
+fi
 # shellcheck disable=SC2086
-ansible-test compile --failure-ok --color -v --junit --requirements --coverage ${CHANGED:+"$CHANGED"}
-# shellcheck disable=SC2086
-ansible-test sanity  --failure-ok --color -v --junit --tox --skip-test ansible-doc --skip-test import --python 3.5 --coverage ${CHANGED:+"$CHANGED"}
+ansible-test compile --failure-ok --color -v --junit --coverage ${CHANGED:+"$CHANGED"} --docker default
 # shellcheck disable=SC2086
-ansible-test sanity  --failure-ok --color -v --junit --tox --test      ansible-doc --test      import              --coverage ${CHANGED:+"$CHANGED"}
+ansible-test sanity  --failure-ok --color -v --junit --coverage ${CHANGED:+"$CHANGED"} --docker default --docker-keep-git --base-branch "${base_branch}"
 
 rm test/results/bot/ansible-test-failure.json
 
diff -Nru ansible-2.4.1.0/test/utils/shippable/units.sh ansible-2.4.2.0/test/utils/shippable/units.sh
--- ansible-2.4.1.0/test/utils/shippable/units.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/utils/shippable/units.sh	2017-11-29 21:10:32.000000000 +0000
@@ -7,7 +7,5 @@
 
 version="${args[1]}"
 
-retry.py pip install tox --disable-pip-version-check
-
 # shellcheck disable=SC2086
-ansible-test units --color -v --tox --python "${version}" --coverage ${CHANGED:+"$CHANGED"} \
+ansible-test units --color -v --docker default --python "${version}" --coverage ${CHANGED:+"$CHANGED"} \
diff -Nru ansible-2.4.1.0/test/utils/shippable/windows.sh ansible-2.4.2.0/test/utils/shippable/windows.sh
--- ansible-2.4.1.0/test/utils/shippable/windows.sh	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/test/utils/shippable/windows.sh	2017-11-29 21:10:32.000000000 +0000
@@ -40,12 +40,7 @@
     )
 fi
 
-retry.py pip install tox --disable-pip-version-check
-
 for version in "${python_versions[@]}"; do
-    # clean up between test runs until we switch from --tox to --docker
-    rm -rf ~/.ansible/{cp,pc,tmp}/
-
     changed_all_target="all"
 
     if [ "${version}" == "2.7" ]; then
@@ -72,7 +67,14 @@
         ci="windows/ci/minimal/"
     fi
 
+    # terminate remote instances on the final python version tested
+    if [ "${version}" = "${python_versions[-1]}" ]; then
+        terminate="always"
+    else
+        terminate="never"
+    fi
+
     # shellcheck disable=SC2086
-    ansible-test windows-integration --color -v --retry-on-error "${ci}" --tox --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
-        "${platforms[@]}" --changed-all-target "${changed_all_target}"
+    ansible-test windows-integration --color -v --retry-on-error "${ci}" --docker default --python "${version}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} \
+        "${platforms[@]}" --changed-all-target "${changed_all_target}" --remote-terminate "${terminate}"
 done
diff -Nru ansible-2.4.1.0/VERSION ansible-2.4.2.0/VERSION
--- ansible-2.4.1.0/VERSION	2017-10-26 05:55:44.000000000 +0000
+++ ansible-2.4.2.0/VERSION	2017-11-29 21:10:31.000000000 +0000
@@ -1 +1 @@
-2.4.1.0 1
+2.4.2.0 1