Merge "Fix nodepool-zuul-functional"