am 309e107f: Merge "Update getaddrinfo to RFC6724" into jb-mr2-dev

* commit '309e107f01e13bbe90ba31f2eee5d526ff676222':
  Update getaddrinfo to RFC6724