Merge pull request #6109 from RosettaCommons/roccomoretti/fix_master_tests Fix some broken tests in master * virtual/override redundancy which was causing clang_tidy to complain * Missing flag which was causing match_xml integration test to crash.