Move serverConnection.terminate() back into the finally

(Bitbake rev: 58e1b0a5dbd0f1ca137ad7ed1bd7ad9975a20fb7)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

bitbake/bin/bitbake

@@ -206,8 +206,9 @@ Default BBFILES are the .bb files in the current directory.""")
         except Exception, e:
             print "FATAL: Unable to start to '%s' UI: %s" % (ui, e)
             raise
+    finally:
+        serverConnection.terminate()
 
-    serverConnection.terminate()
     return return_value
 
 if __name__ == "__main__":