[Merge] ~andrew.sh/unity:fix-auth-failure-lp1733557 into unity:master

[Andrej Shadura]

How about:

- merging this fix as is and get it into packages asap to make the lockscreen work properly for the users
- rewrite it in the proper way while the hacky fix is making lives easier :)

I’m willing to look into the proper fix myself, but I’d like to unbreak this sooner rather than later.
-- 
https://code.launchpad.net/~andrew.sh/unity/+git/unity/+merge/362414
Your team Unity Team is requested to review the proposed merge of ~andrew.sh/unity:fix-auth-failure-lp1733557 into unity:master.