Merge branch 'sh-add-user-constraints' into 'master'

Fix missing constraints causing route failures when usernames with periods are used

Closes #23131

See merge request !6758