Merge branch 'nl-hierarchy-fix' into 'master'

Fix ancestry overlap with description

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



Merged-by: Kushal Pandya <kushal@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Nick Leonard <nleonard@gitlab.com>