This aligns once more with other loaders ("data" test resources folder). It's
not particulary interesting but this also cleanup 2 archives which contained
themselves for no good reason...
Not necessarily to review. I'm waiting for jenkins to say "green" to land it.
Related to T2462