Issue #3443663 - Automated drupal 11 fixes

Silvi Sanghavirequested to merge
issue/focal_point-3443663:3443663-automated-drupal-11 into 2.x

Closes #3443663

Merge request reports