Fixes #7040.

Pipes should now only be considered overlapping if they share connection types.
Relevant pipe fixes.
Merge remote-tracking branch 'upstream/dev' into Pipes
Merge pull request #7050 from PsiOmegaDelta/Pipes

Fixes #7040