🙊 🙉 🙈 ... I declare Ema the winner of breaking the most stuff .... everyone else are just posers

LOL wow... There we go, thank you so much Ema!

And, it's DONE. 😆

/me runs

I presume the next days will be booked for rebasing and fixing. :) Luckily, the changes introduced by this PR should be practically always the same. There are no changes in parameters lists, and names are similar.

Just a suggestion: I would use rebase, not merge, for updating (older) branches to the current master. Merge would create yet another such big commit. And if there are conflicts, the merge will be hard for you and for us to read and review, and it could risk to revert valid changes.
On the contrary, rebase will try to apply anew one by one, your commits on the older branch, on top of the current master. That leads to a clean result, at least readable for you as well as everyone :)
A sequence I'd use is like:

git checkout master
git pull elkarte_remote master
git checkout list_old_branch
git rebase master // may have conflicts to solve
git push origin list_old_branch // if the branch has already been published, git may reject this push
git push -f origin list_old_branch