Merge changes Ic029cc9f,Id917f3a2 into oc-dev

* changes:
  NsdService: minor cleanups
  Nsdmanager/NsdService: add logging
tree: 8a758d31c9d43c25bfedf5f5f394a06c9a78a271
  1. core/
  2. services/
  3. wifi/