Issue #3295940: Fix test, D10 compatibility things and drupal-check errors.

attilatilmanrequested to merge
issue/focal_point-3295940:3295940-drupal-10-compatibility into 2.x

Closes #3295940

Merge request reports