Massaged error message when user API token has changed or user was deleted, then added again
Merge branch 'master' into builds
7.104