I sent a patch to this ticket yesterday, before remembering this morning that y'all probably weren't auto-Cc'd on it by debbugs.
Please have a look over it, especially the tests, in case I missed some functionality or misinterpreted some requirements. This will probably be deserving of a news item, since it will cause multiple deletes on the same service type to fail, and that's what at least some people are doing due to the previous patch. One option would be to convert the ‘raise’ incantations to warnings, at least for a while to give people a chance to update without their configs breaking, but I don't know a good way to do that. -bjc
