Merge proposals dependent on lp://staging/~mardy/signon/test

lp://staging/~mardy/signon/test has no merge proposals.