Automatic merge from submit-queue (batch tested with PRs 46913, 48910, 48858, 47160)

Fix "make help" info

**What this PR does / why we need it**:
fixes some incorrect help info

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #46911

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```