Add option to use HFS Plus decomposition (issue 2872)
Use UTF-16 for hfs-plus decomposition