Resolve #3588274 "Backport taxonomy"

Stephen Mustgraverequested to merge
issue/drupal-3588274:3588274-backport-taxonomy into 11.x

Closes #3588274

Merge request reports