Drupal 11 compatibility fixes.

Chandan Singhrequested to merge
issue/scheduler-3434325:3434325-automated-drupal-11 into 2.x

Closes #3434325

Merge request reports