Conflicts:

	lib/ansible/utils/__init__.py

AWS route53 module

When a role/include has a conditional, add that conditional ahead of any on the task, not behind, so it can short circuit.

Breaks recursion parameter on file.

This reverts commit e7226e10.

Use AnsibleFilterError exception

Quote pathnames of roles' tasks and handlers files so that _load_tasks()...

With the help of AlejandroTrev's eagle eyes. Thanks !

narrowed down exception 

Check if mysql allows login as root/nopassword before trying supplied credentials.

Rewritten s3 module to allow for additional modes of operation.

supervisorctl: add command-line options as module parameters

openbsd_pkg: Use ansible run_command().

Introduce exception AnsibleFilterError and use it in Jinja filters.  Ign...

Only append non_unique parameter if a uid is provided as well to user module

cases and avoid usless work.
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>

Let rabbitmq plugin module use nonstandard path

Keystone_user module: fix authentication needs tenant_name too

digital_ocean: don't run update_attr if wait=no

Fix inconsistent json output in file module

Added IAM role support