Update the cherrypy branch to use authz.afs.cells instead of just