Improved startup and shutdown for tornado
Merge remote-tracking branch 'upstream/dev' into testing