Undid accidental change removing groovy imports from
SuppressUnderliningTypeLookup, removed IvyUtils' dependency on Guava.