[f18-branch/master] [PATCH] Encode unicode strings returned by pytz.country_timezones() (#887236)