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

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