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.
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.
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 pull request #6319 from risaacson/fix_test_dir_inventory

Fix TestInventory Unit Tests

Tested clean.