ACCUMULO-2125 upping guava
ACCUMULO-2165 temporary fix