fix: password regex skip lines end with 'password'

[xiangce]

All Pull Requests:

Check all that apply:

• [x] Have you followed the guidelines in our Contributing document, including the instructions about commit messages?
• [x] Is this PR to correct an issue?
• [ ] Is this PR an enhancement?

Complete Description of Additions/Changes:

• refine the workaround of #4074
• fix RHINENG-9901 as well