Issue #3169432 by karishmaamin, jidrone: Drupal 9 compatibility

Ivan Duarterequested to merge
issue/domain_group-3169432:3169432-drupal-9-compatibility into 8.x-1.x

Added previous changes and other deprecations.

Merge request reports