Merge change Iefd4a388 into eclair

* changes:
  Suppress flaky test AppCacheTest#testFreeApplicationCacheSomeFiles