Merge branch 'kballon-master-patch-57023' into 'master'

Updated support for Microsoft attribute names

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138721



Merged-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Kent Japhet Ballon <kballon@gitlab.com>