[28.x backport] cli/command: rename vars for consistency and prevent shadowing#6390

thaJeztah merged 1 commit intodocker:28.xdocker/cli:28.xfrom

thaJeztah:28.x_backport_avoid_shadowingthaJeztah/cli:28.x_backport_avoid_shadowingCopy head branch name to clipboard