Merge "Correctly apply irrelevant-files to simple job names" into feature/zuulv3