In reactivate:
  * Remove old c-p-d undivert code, it's no longer needed
  * Stop processing schroot.conf in the preinst


git-svn-id: svn+ssh://svn.mit.edu/athena/trunk@26011 728af825-273c-0410-89f9-f7d3b574a069