Merge proposals dependent on lp://staging/~dobey/ubuntu-sso-client/lint-fix

lp://staging/~dobey/ubuntu-sso-client/lint-fix has no merge proposals.