Resolve #2828556 "Update error messages"

David Cameronrequested to merge
issue/drupal-2828556:2828556-update-error-messages into 11.x

Closes #2828556

Merge request reports