golint fixes for cliconfig Upstream-commit: 4c0fb857298fc8a6fcd97f53e017068ec056aba9 Component: engine