Golint and Ineffassign fixes Upstream-commit: a44274f1c033004f0aaaa225aa98c58c018623f6 Component: engine