Modernize 4366 unrevert
Merge branch 'cassandra-1.2' into trunk
fix bash string comp
Merge branch 'cassandra-1.2' into trunk