Merge "Ansible launcher: remove deprecated hyphens"