Merge next-stable.

lib/galaxy/app.py

@@ -159,6 +159,8 @@ class UniverseApplication( object, config.ConfiguresGalaxyMixin ):
             self.heartbeat.shutdown()
         if self.update_manager:
             self.update_manager.shutdown()
+        if self.control_worker:
+            self.control_worker.shutdown()
         try:
             # If the datatypes registry was persisted, attempt to
             # remove the temporary file in which it was written.

lib/galaxy/queue_worker.py

@@ -63,6 +63,9 @@ class GalaxyQueueWorker(ConsumerMixin, threading.Thread):
             log.warning("Recieved a malformed task message:\n%s" % body)
         message.ack()
 
+    def shutdown(self):
+        self.should_stop = True
+
 
 def send_control_task(trans, task, noop_self=False, kwargs={}):
     log.info("Sending %s control task." % task)