Resolve #3583887 "Drupal 11 compatibility"

Paul Mickanrequested to merge
issue/email_content_templates-3583887:3583887-drupal-11-compatibility into 1.0.x

Closes #3583887

Merge request reports