Blender Git Loki

Fix Bevel bugs T39726 and T39108, bevels with wire edges.

This updates the fix in rB27db75363, which had to be undone
because it broke other bevels.
It also fixes cases where edges went away went doing vertex
bevel on vertices with some wire edges.