Issue 1464354: Rerolling ENUM patch.

Rhiannon Purnellrequested to merge
issue/drupal-1464354:1464354-solution-for-enums into 9.5.x

Closes #1464354

Merge request reports