Fix for issue 10154, merge from 3.2

diff --cc Misc/NEWS
index c774b4826116a85095b565bb65d1a1c4e72011e1,7db72e77696a56888831833f9f49e3a6adb01b1e..c214cc588984c5034c4a98896ffd8d09c90cb040
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -999,6 -698,13 +999,9 @@@ Librar
    and a non-zero offset, and an attempt to read past the end of file is made
    (IndexError is raised instead).  Patch by Ross Lagerwall.
  
 -- Issue #10684: shutil.move used to delete a folder on case insensitive
 -  filesystems when the source and destination name where the same except
 -  for the case.
 -
+ - Issue #10154, #10090: change the normalization of UTF-8 to "UTF-8" instead
+   of "UTF8" in the locale module as the latter is not supported MacOSX and OpenBSD.
+ 
  - Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather
    than the currently problematic Apple-supplied one, when running with the
    64-/32-bit installer variant.