Merge "Forward-port v2.5 Ansible launcher improvements" into feature/zuulv3