fix yaml comment for 6059
Merge branch 'cassandra-2.0' into trunk