Fixing misc bugs hit during central server release.
cherrypy wasn't starting due to None CONTENT_ROOT; registration had an include & function call error
Merge pull request #1339 from bcipolli/release_bugs_1

Fixing misc bugs hit during central server release.