#3431648 more Drupal 11 fixes

James Glasgowrequested to merge
issue/libraries-3431648:3431648-automated-drupal-11 into 4.0.x

Closes #3431648

Merge request reports