Fix usages of deprecated code in Drupal 9.3.x

Alex Pottrequested to merge
issue/webform-3250330:3250330-remove-usages-of into 6.x

Closes #3250330

Merge request reports