Merge pull request #19806 from eileenmcnaughton/msg_compat
authorTim Otten <totten@civicrm.org>
Fri, 26 Mar 2021 21:26:34 +0000 (14:26 -0700)
committerGitHub <noreply@github.com>
Fri, 26 Mar 2021 21:26:34 +0000 (14:26 -0700)
Align most of the tokens in the token processor handling with the legacy handling


Trivial merge