Merge proposals dependent on lp://staging/~mvo/software-center/do-not-crash-on-broken-sso-lp1068680

1. do-not-crash-on-broken-sso-lp1068680
2. Dependent merge proposals