am bbb8672d: Merge "Fix ConcurrentCloseTest\'s write test to ensure we\'re really blocked in write(2)."

* commit 'bbb8672d27383e03f3b334e8738d4a4d0e737731':
  Fix ConcurrentCloseTest's write test to ensure we're really blocked in write(2).