Issue #3129947: Drupal 9 readiness

Jay Huskins requested to merge issue/private_entity-3129947:3129947-drupal-9-readiness into 8.x-1.x Sep 11, 2021