Add missing part for CASSANDRA-3668
Merge branch 'cassandra-2.1' into trunk