[28.x backport] remove uses of client options that will be deprecated#6473

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

thaJeztah:28.x_backport_deprecation_preparationsthaJeztah/cli:28.x_backport_deprecation_preparationsCopy head branch name to clipboard