Merge change I3429f77a into eclair

* changes:
  Suppress flaky test HeapTest#testOomeLarge.