fixing two tests to work under the new worker discovery system
Merge remote-tracking branch 'origin/mhrivnak-fix-babysit-test' into bmbouter-1096311
Add normal_shutdown argument to _delete_queue.

This adds a logging behavior to _delete_queue that only shows an error if a
worker did not shutdown normally.  Also has the worker-shutdown handler use
this argument correctly.  It comes with test coverage.