Merge changes from topic "nsd_serviceinfo_network"

* changes:
  Support discover/resolve on specific networks
  NSD: Specify on what interface to getAddrInfo