am bcd029b6: Merge "Add missing clean-up of idmap file descriptors."

* commit 'bcd029b6c8dee19d2cefb00f3ff637b4dcd407b3':
  Add missing clean-up of idmap file descriptors.