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

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