Draft: Issue #3199697: Updating 11.x branch with changes from 3199697-jsonapi_translation-11 branch, see if they still apply

Co-authored-by: Wim Leers 44946-wimleers@users.noreply.drupalcode.org