Merge "SSH improvements for Ansible"