Cleanup invirt-web's cherrypy-rebased -> trunk merge in the git-migration