Revert CASSANDRA-5577 to fix CASSANDRA-6025 and add test
patch by jbellis
Merge branch 'cassandra-2.0' into trunk
CHANGES
Merge branch 'cassandra-2.0' into trunk
make Config match yaml (#6059)
Merge branch 'cassandra-2.0' into trunk