Merge "Ansible launcher: use underscores where appropriate"