Fixes more issues that were preventing proper shutdowns, restarts, and upgrades.
Fixed branch version to reflect proper branch
Fixed API code to work with tornado.
Testing update/restart fix
Merge remote-tracking branch 'upstream/dev' into testing