Auto-sync with upstream branch master
    
    Upstream commit: ae49a7b29acc184b03c2a6bd6ac01b5e08efd54f
    
    - Relicense IBM portions of resolv/base64.c resolv/res_debug.c.
    - localedata: Use consistent values for grouping and mon_grouping
    - manual: fix order of arguments of memalign and aligned_alloc (Bug 27547)