Issue #3304017: Add Drupal 10 compatibility fixes

Eva Martínezrequested to merge
issue/entity_counter-3304017:3304017-automated-drupal-10 into 8.x-1.x

Closes #3304017

Merge request reports