Fix several issues with `go vet` and `gofmt -s` Upstream-commit: a7987ef105 Component: cli
a7987ef105