Issue #3147370: Automated Drupal 9 compatibility fixes

guisharkorequested to merge
issue/entity_type_class-3147370:3147370-automated-drupal-9 into 8.x-1.x

Merge request reports