Update version for 2.0.5 release
fix fat client tests
Merge branch 'cassandra-1.2' into cassandra-2.0