Merge pull request #3607 from stoned/use-AnsibleFilterError

Use AnsibleFilterError exception
Revert "Fix inconsistent json output"

Breaks recursion parameter on file.

This reverts commit e7226e104e98375529c92acc0c1f21d4d7604a07.
Update htpasswd module for various API incompatibilities
Added some pipes.quote ops to make sure paths with spaces in them are ok.
When a role/include has a conditional, add that conditional ahead of any on the task, not behind, so it can short circuit.
Update CHANGELOG
Fix for saving conditionals in variable expressions.
Merge branch 'devel' of git://github.com/sjmudd/ansible into sjmudd_ranges
update CHANGELOG
Merge branch 'playbook-skip-tags' of git://github.com/dekked/ansible into skip_tags
Remove task count information from task list.
Merge pull request #3574 from bpennypacker/route53

AWS route53 module
Update changelog
Merge branch 'iss_cron' of git://github.com/dirtyharrycallahan/ansible into dh_cron
Update CHANGELOG
Merge branch 'changed_when' of git://github.com/stoned/ansible into changed_when
Change conditional operation workflow.
Work in progress on merging changed_when.
Change conditional operation workflow.

Conflicts:

	lib/ansible/utils/__init__.py
Merge branch 'changed_when' into devel