Merge "Add captive portal info to DhcpClient output"