Refs #21182 - Refactoring to speedup "broken relations algorithm"
Refs #21182 - Fix tests
Refs #21182 - Another tests fix.
Merge remote-tracking branch 'collective/master'