Land the Log4shell CVE-2021-44228 fixes to v2023
The fix has already been landed to v2022pre, but due to some brokeness around Java packages in v2023dev0 it has not been possible to land it there.
We need to fix the brokenness and then land this MR.