Merge branch 'derekferguson-master-patch-8f1e' into 'master'

Clarifying support of feature flags and features behind them

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



Merged-by: Lysanne Pinto <lpinto@gitlab.com>
Approved-by: Andrew Thomas <athomas@gitlab.com>
Approved-by: Lysanne Pinto <lpinto@gitlab.com>
Co-authored-by: Derek Ferguson <dferguson@gitlab.com>