3589101: Drupal 11 compatibility

Geoffrey Robertsrequested to merge
issue/kml-3589101:3589101-drupal-11-version into 8.x-1.x

Closes #3589101

Merge request reports