#11602 - Cleanup redundant else statements find via golint Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508 Component: engine
#11602 - Cleanup redundant else statements find via golint Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508 Component: engine