fix some glitches due to rebase conflicts
fix URLResourceTest with workaround
Revert "replace old LoadService.findLibraryWithClassloaders with search on classloader"

This reverts commit 4ec7615d1ac1e33d4a1cd9fb00f431dbe7fb904b.
clean up ClasspathResource