[TO_STAGE] Bug 969725: Ensure cleanup on cartridge deconfigure