Issue #3198612: Drupal 9 readiness

drupalfan2 requested to merge issue/consistent_uid-3198612:3198612-drupal-9-readiness into 8.x-1.x Feb 15, 2021