Merge proposals dependent on lp://qastaging/~mardy/ubuntuone-credentials/fix-token-tests

lp://qastaging/~mardy/ubuntuone-credentials/fix-token-tests has no merge proposals.