Merge "Refactor skip-if tests to use irrelevant-files" into feature/zuulv3