Merge "Captive portal systel log improvements"