dedup CHANGES
Merge branch 'cassandra-2.1' into trunk
Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)

patch by Matt Kennedy; reviewed by Benedict Elliott Smith for CASSANDRA-7416