Auto-sync with upstream master
    
    Upstream commit: f4a6be2582b8dfe8adfa68da3dd8decf566b3983
    
    - malloc: Abort on heap corruption, without a backtrace (swbz#21754)
    - getaddrinfo: Return EAI_NODATA for gethostbyname2_r with NO_DATA (swbz#21922)
    - getaddrinfo: Fix error handling in gethosts (swbz#21915) (swbz#21922)
    - Place $(elf-objpfx)sofini.os last (swbz#22051)
    - Various locale fixes (swbz#15332, swbz#22044)