Fixed pending issues for d10

sarwan vermarequested to merge
issue/phpmailer_smtp-3433841:3433841-drupal-11-compatability into 2.2.x

Merge request reports