Issue #3157897: Drupal 9 readiness

Benjamin R requested to merge issue/zen-3157897:issue/zen-3157897-3157897-drupal-9-readiness into 8.x-7.x Feb 18, 2021