Resolve #3597869 "Drupal 12 compatibility prep"

Jess Straatmannrequested to merge
issue/entity_usage_plus-3597869:3597869-drupal-12-compatibility into 1.0.x

Closes #3597869

Merge request reports