Final fix for bug Bug 394569

Performance improvements for findFileLocationURI
3 files changed