Bug 834122 - FTU captive portal
Merge pull request #7979 from alivedise/bugzilla/834122_v1-train/rebasing2

Bug 834122 - FTU captive portal, r=timdream, a=blocking-b2g:shira+