We delete the faces for consideration in this loop but we can still
sometimes find an edge that connects to this face. We now interate over
all edges and disconnect edges connecting to this face.
This fixes#16560 and fixes#17569
(cherry picked from commit 33669a8bca)