Merge change Ice8c6c56

* changes:
  Removing caching of file canonical path caching, and fixing NIO tests.