Merge changes Ia15f77e2,Icaa1f95c

* changes:
  Captive portal: regroup hardcoded http response codes.
  Captive portal: rotate fallback urls