fix incorrect patch generation for patches with 2 non-consecutive boundary edges

add catmark_flap2 shape & baseline to regression suite

fixes #188