Merge changes I9ad4ce81,I360d539e

* changes:
  NsdService: minor cleanups
  Nsdmanager/NsdService: add logging