Merge proposals dependent on lp://staging/~canonical-isd-hackers/canonical-identity-provider/bug_392101_cookie_test_alt

1. bug_392101_cookie_test_alt
2. Dependent merge proposals