This corrects and simplifies the file matchers for these jobs at
the expense of possibly running some extra jobs in some cases.
The alternative is a lot of duplicated lists that will be hard
to maintain.
Change-Id: I97406cd0506a438e4b14bbbee3d1b61026f40cd7
40f9c38d0c