Merge changes I0c3887f2,I8fc585bb into oc-dev

* changes:
  logd: correctly label identical lines
  logd: strip out empty trailing iovec