Merge proposals dependent on lp://staging/~jayvdb/testscenarios/fix-py3-tests

lp://staging/~jayvdb/testscenarios/fix-py3-tests has no merge proposals.