fix golint errors/warnings Upstream-commit: e77ea5aa7aee20bc29b65efd92e9960b58db3435 Component: engine