Merge proposals dependent on lp:~ralsina/ubuntu-sso-client/fix_805461

lp:~ralsina/ubuntu-sso-client/fix_805461 has no merge proposals.