fix tests
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix tests
Revert "fix tests"

This reverts commit fbd51b77a047f2a04a94c4b474881c2be9bf1171.
Merge branch 'cassandra-2.0' into trunk