Repair guava dependencies
Guava shading fixes for eclipse and IntelliJ