Switched to Guava 16.0 for CASSANDRA-6639
remove dead code
Merge branch 'cassandra-2.0' into trunk
Don't swallow useful exceptions.
patch by Ding Yuan; reviewed by Mikhail Stepura for CASSANDRA-6656