am 60adb5fa: Merge "Qualify IPv6 link-local DNS servers with an interface name" into mnc-dev

* commit '60adb5fac864d05f19c6ae5e6295578749427ff3':
  Qualify IPv6 link-local DNS servers with an interface name