Issue #3139394 by DamienMcKenna, driverok, dmitry.korhov, mradcliffe, alexpott, alexandra.vecher: Drupal 9 compatibility fixes.