Closes #3147988 by providing the automated fixes to give the module Drupal 9 support, along with the repairs made manually by @aprice42