OM 2.0: Remove references to additional suffixes on samples#2875

dashpole merged 2 commits intoprometheus:mainprometheus/docs:mainfrom

dashpole:cleanup_5dashpole/docs:cleanup_5Copy head branch name to clipboard