Merge "Replace some uses of deprecated wfFindFile() and wfLocalFile()"