Merge proposals dependent on lp://staging/~twom/loggerhead/fix-text-types-python-2

lp://staging/~twom/loggerhead/fix-text-types-python-2 has no merge proposals.