Preparing to pull in upstream changes to use the new client interface for further cherrypy testing.