Start fixing the salt api events to be raet aware correctly
finish change in cherrypy api interface