Merge change I4413e8bc into eclair-mr2

* changes:
  close file descriptors passed to drop box