Merge proposals dependent on lp:~mandel/ubuntu-sso-client/fix-activation-tests

lp:~mandel/ubuntu-sso-client/fix-activation-tests has no merge proposals.