[do not merge] Try to identify shutdown problem

Please don't merge this PR.

I'm using it to try to identify a problem in TeamCity where tests are failing because ports are in use. This may be because previous tests are not shutting down cleanly. The intention here is to expose any shutdown problems by not swallowing shutdown exceptions.