ec2_vol: update docs to match default device_name values for Unix/Windows.
ec2_vol: do no work if the instance has a volume mounted at the device.
Tweaked merge_hash to also affect Runner behavior
Add availability zone parameter
Update documentation for rax module

Only list the services supported
Don't put in unncessary required: false
Use better formatting for the example
Only accept supported services for rax module

Even though others are possible, fail early on unsupported ones.
clean up how it puts the files in place - in f18 /tmp is tmpfs which
means ln and os.rename() won't work across fs.
make atomic_replace use shutil.copy2 instead of os.rename() so it will
work across filesystems
Merge pull request #2698 from skvidal/atomic_replace_and_cron

Atomic replace and cron
Make more lookup plugins happy with newstyle variables.  Not quite done, but this fixes up with_items/with_nested/file/fileglob.
Make more lookup plugins tolerant of new variable system, with a little better 'do what I mean' logic to resolving
what happens if you get a string back as a template result.
Remove a debug statement.
Merge pull request #2692 from j2sol/rax

Minor fixes to the rax module
Merge pull request #2580 from blair/ec2_vol-improvements

Ec2 vol improvements
Allow '.yml'/'.yaml' extension on group_vars files.

Look for a file with the base name of the group/host, first without
a file extension, then with a '.yml' extension, and, finally, with
a '.yaml' extension, loading vars from only the first one found.
Merge branch 'combine_vars' of git://github.com/laggyluke/ansible into exp

Conflicts:
	lib/ansible/inventory/vars_plugins/group_vars.py
	lib/ansible/runner/__init__.py
	lib/ansible/utils/__init__.py
	test/TestPlayBook.py
Add version added to module docs
Use platform.node() for the hostname, leave fqdn calculated the same way
Merge pull request #2608 from lwade/ec2zone

Add availability zone parameter