Revert CASSANDRA-5577 to fix CASSANDRA-6025 and add test
patch by jbellis
CHANGES
make Config match yaml (#6059)