Merge change Ie21b2327 into eclair-mr2

* changes:
  DO NOT MERGE: Removing the use of FileCanonPathCache.