Backported CVE fixes

  • Alternative fix for bug 77423 (CVE-2020-7071)
  • Fix bug #80672 - Null Dereference in SoapClient (CVE-2021-21702)