D11 compatibility changes

Dobrin Dobrevrequested to merge
issue/peytz_mail-3585157:3585157-drupal-11-compatibility into 8.x-1.x

MR made so these changes can be used in composer.json

Merge request reports