Issue #3252359 by murilohp, DamienMcKenna: Remove workarounds for Drupal 8, update references to say "Drupal 9"