Commit message

Description of the change

Adam, can you double-check that this looks sane to you for handling conffile
removal on upgrades? We don't want to leave stale conffiles on the system,
but we also don't want to do anything here that might break the upgrade.