Merge proposals dependent on lp:~mikemc/ubuntu-sso-client/fix-1023043-buildout-in-test

lp:~mikemc/ubuntu-sso-client/fix-1023043-buildout-in-test has no merge proposals.