Merge "SiteLibraryLoaderUtil: catch NoSuchFileException when scanning for JARs"