Merge proposals dependent on lp://qastaging/~elopio/canonical-identity-provider/fix1256365-python3

lp://qastaging/~elopio/canonical-identity-provider/fix1256365-python3 has no merge proposals.