Replaced cherrypy with tornado which helped resolve our memory leak issue.
Merge remote-tracking branch 'remotes/upstream/dev' into testing