Merge "Fix hostname issue with nodepool integration job" into feature/zuulv3