Needed in order to backport strxfrm_l security fix cleanly. (cherry picked from commit 8c0ab919) Conflicts: ChangeLog