Merge branch 'update_docs_validate_cmd_not_passed_via_shell' of git://github.com/rwehner/ansible into devel

Conflicts:
	library/files/template