Merge with 3.3: Issue #17432: Drop UCS2 from names of Unicode functions in python3.def.