Drupal 11 compatibility fixes

Shamir vsrequested to merge
issue/multistep_form_framework-3451218:3451218-drupal-11-compatibility into 2.x

Closes #3451218

Merge request reports