XCOMMONS-632: Upgrade to Guava 18.0