JCLOUDS-653 revert guava 18.