It has happened because you did not have the patches applied
when you upgraded the project. Apply the patches does not correct
the issue in RH7, you have to upgrade again or clean up manually.
The multi file find and replace tool only works on a single
line like many such tools. If you use FAR or BKReplaceEm, they do
work across multiple lines.
See Using RH7 on my site for details of the bug. The links
page will help you find the tools mentioned.
Help others by clicking Correct Answer if the question is answered. Found the answer elsewhere? Share it here. "Upvote" is for useful posts.