Merge "Try to more robustly identify algorithm for JARs"