golint: Drop the "else" block when if ends with a return
golint: Drop the "else" block when if ends with a return

Warning from golint:

  "if block ends with a return statement, so drop this else and outdent
   its block"

Signed-off-by: Damien Lespiau <64bd3cb94f359c1a3ce68dae5e26b40578526277@intel.com>

dlespiau/clearcontainers-proxy,clearcontainers/proxy,dlespiau/clearcontainers-proxy,dlespiau/proxy,dlespiau/proxy,clearcontainers/proxy