Merge "Fixing ipv6-only job"