fix merge from #6132
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6154
fix merge