Merge changes Idaa6699d,Ic7759ef9

* changes:
  logd: sock_alloc_send_pskb starves pruning
  logd: Allow (some) headers to be individually importable