Merge pull request #10278 from fabi1cazenave/wpsSimplifiedStatus-bug879193

Bug 879193 - simplified WPS connection status, r=Rik(cherry picked from commit 5374d783a27a842a1a82d0293781de4d883f4015)