Fixes for Issue #3207619 and #3372943
Issue #3296632 by sstapleton, NicholasS, Project Update Bot, Tanuja Bohra, hockey2112, bmango: Automated Drupal 10 compatibility fixes