fix: #3566230 Fix remaining Drupal 10/11 compatibility issues

Joe Parsonsrequested to merge
issue/config_distro-3566230:3566230-make-compatible-with into 2.1.x

By: liam morland By: joegraduate

Closes #3566230

Edited by Joe Parsons

Merge request reports