Merge proposals dependent on lp://staging/~dobey/ubuntu-sso-client/use-dirspec

lp://staging/~dobey/ubuntu-sso-client/use-dirspec has no merge proposals.