feat: #3558486 Improve wording for Untrusted roles warning, or update the check

Stephen Mustgraverequested to merge
issue/security_review-3558486:3558486-improve-wording-for into 3.1.x

By: @ressa

Closes #3558486

Merge request reports