Merge branch 'elastic-keep/remove-traits' into 'master'

MarkOldAdvancedSearchMigrationsAsObsolete keep: remove traits from specs

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



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Ravi Kumar <rkumar@gitlab.com>
Approved-by: Siddharth Dungarwal <sdungarwal@gitlab.com>
Co-authored-by: maddievn <mvanniekerk@gitlab.com>