Branch for 2.5; update guava
Merge branch '2.5' into annotation-introspector