Fixed Drupal 11 compatibility issues.

Vishal Khoderequested to merge
issue/seckit-3434417:3434417-automated-drupal-11 into 2.x

Closes #3434417

Merge request reports