Merge changes I33ac2b52,I5ab8bb11 into oc-dev

* changes:
  Captive portal: fix probe urls at network creation
  NetworkMonitor: improve captive portal validation logs