Hi again @Mukesh Tiwari (or anyone),
Just checking in; I'm unfortunately still stuck here and unable to patch SUPEE-7405. I feel like you got me a lot closer to a solution, but I'm out of ideas at this point and am really hoping someone can suggest something further, based on all of the above changes.
Thanks very much!
