Issue #3302607 by heddn, jungle, omkar-pd, shelane, mparker17, Chris Matthews: Drupal 10 compatibility fixes