This reverts commit cbd1da64.

Merge branch 'atomic_move_restore_owner_group_rebase' of https://github.com/tyll/ansible into tyll-atomic_move_restore_owner_group_rebase

[docs] adds missing `'` to debconf examples

Some clarifications about workflow and the priority queue in GitHub

Add tesing deps installation into hacking/README

ec2: Adding type int for count (in line with other cloud modules)

Add missing sha1 import on known_hosts.py

Fix ValueError when selection contains a colon

Remove print statements

This was apparently an oversite, as it has never been configurable
despite having a module parameter for the timeout.

* Added capability to support multiple keys, so clients from different
  machines can connect to a single daemon instance
* Any activity on the daemon will cause the timeout to extend, so that the
  daemon must be idle for the full number of minutes before it will auto-
  shutdown
* Various other small fixes to remove some redundancy

Fixes #5171

"print item" raises an exception when type of item is
jinja2.runtime.StrictUndefined

Signed-off-by: Max Riveiro <kavu13@gmail.com>

Clarify documentation for apt pkg, state, install_recommends

Addresses #6591 Hide diff for lineinfile if file did not change.

Allow npm to install to a directory that doesn't yet exist

etcd lookup: use $ANSIBLE_ETCD_URL if it exists in the env

If path is specified but does not exist, create it.
Fail if path is specified but is not a directory

This allows usage of custom ssh configs for remote hosts where
the inventory user does not match the configured user.

assign_public_ip was actually added in 1.5

Checked 1.4.5 and this option doesn't exist. Will check/update/pull docs next.

Fix a potential race condition by using the tempfile module.

Manually restore owner and group if both src and dest are on a separate
file system.