fix build
fix sstr test
Merge branch 'cassandra-2.0' into trunk
fix sstr test