don't declare throwing exceptions that aren't thrown
Merge branch 'cassandra-2.0' into trunk