Merge pull request #6313 from phenomenes/msg-encoding-fix

Don't use keyword `error` in encode
Merge pull request #6308 from muffl0n/file_fix_documentation

Module "file": Fix link to "path" in documentation
Merge pull request #6305 from amree/fix-mysql-replication-port

Fixed SQL syntax error when running mysql_replication module
Typo
Fixes related to uncommenting test_dir_inventory in TestInventory.

0. Uncomment the test.
1. Test fails.
2. Make vars unique per file in test inventory files.
3. Modify token addition to not ast.literal_eval(v) a variable containing a hash.
4. Modify vars to have an escape in test inventory file.
5. Catch exceptions explicitly. Any unknown exceptions should be a bug.
6. Test passes.
Merge pull request #6317 from l0neranger/devel

Typo
Fix logic checking for both sudo and su, and their respective users
Fix test_async by using env python
add test same host in different files in dir

tests issue #5749
 same host defined in different groups which in turn are defined
 in different ini files in an inventory directory

Conflicts:
	test/units/TestInventory.py
modifed test to use get_hosts instead of get_groups

closes #5749

Conflicts:
	test/units/TestInventory.py
Formatting cleanup.

Post merging of GH-5837 via GH-5749.
Sanitize run_command argument output

Fixes #6316
Remve debug file from vault unit test
Merge pull request #6318 from jimi-c/issue_5305_ec2_elb_None_issue

Adding a wait loop to ec2_elb for the initial lb state when registering
Use correct value of ansible_distribution in integration tests

This fixes integration tests when run on a RHEL system.  Oddly, the
ansible_distribution='RedHat' when run on RHEL.
Correct ansible_distribution typo

Redhat != RedHat
Merge branch 'devel' of https://github.com/aresch/ansible into aresch-devel
Merge pull request #6319 from risaacson/fix_test_dir_inventory

Fix TestInventory Unit Tests

Tested clean.
Use isinstance() rather than a check using type()
Merge branch 'aresch-devel' into devel