Merge change I5535bbdf into eclair

* changes:
  Disable flaky and failing tests.