Issue #3128192: Drupal 9 readiness

anruether requested to merge issue/toolbar_menu_clean-3128192:3128192-drupal-9-readiness into 8.x-1.x Feb 21, 2021