JBTM-1810 Ensure that the set of XAResources we obtain in the first scan...

... is the same list as we use in the second scan