Merge "Update getaddrinfo to RFC6724" into jb-mr2-dev