cli/config: some minor cleanups#6352

thaJeztah wants to merge 2 commits into

docker:masterdocker/cli:masterfrom

thaJeztah:cleanup_configthaJeztah/cli:cleanup_configCopy head branch name to clipboard