Merge "Add support for puppet-openstack-integration based jobs" into feature/zuulv3