Merge changes Ic029cc9f,Id917f3a2 into oc-dev

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