Issue #3407370 by heatherwoz: Automated Drupal 10 compatibility fixes

Heather Wozniakrequested to merge
issue/block_place-3407370:3407370-automated-drupal-10 into 8.x-1.x

Closes #3407370

Merge request reports