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

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