bring back the guava 15 changes in the ivy files