Merge "Changes for Ansible 2.4" into feature/zuulv3