go with guava 10 and clean up some remaining old version numbers