Merge "Add support for shared ansible_host in inventory" into feature/zuulv3