Merge "set hostname-override for kubelet"