Merge proposals dependent on lp://qastaging/~mardy/signon-plugin-oauth2/test-fix

lp://qastaging/~mardy/signon-plugin-oauth2/test-fix has no merge proposals.