merged cassandra.yaml changes from 1.2 -> 2.0