Merge "Fix ansible inventory" into feature/zuulv3