Remove remaining uses of pkg/homedir#2143

SamWhited wants to merge 1 commit intodocker:masterdocker/cli:masterfrom

SamWhited:rm_homedirCopy head branch name to clipboard