Merge "Fix captive portal detection on IPv6 networks." into klp-dev