Upgrade guava
Merge pull request #1900 from benmccann/guava2

Upgrade guava