Merge "Makes captive portal server calculation in one place."
tree: 8c88d66f101da403069a7f0982c4eb179447bd2f
  1. core/
  2. services/
  3. tests/