[28.x backport] don't wrap client options#6428

austinvazquez merged 2 commits intodocker:28.xdocker/cli:28.xfrom

thaJeztah:28.x_backport_avoid_client_types_in_optsthaJeztah/cli:28.x_backport_avoid_client_types_in_optsCopy head branch name to clipboard