Fix CleanupTest

patch by marcuse, reviewed by jbellis for CASSANDRA-6679
who forgets to add files? I do.
Log USING TTL/TIMESTAMP in a counter update warning

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6649
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	test/unit/org/apache/cassandra/db/CleanupTest.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Sleep for RING_DELAY before replacing with same IP
Patch by brandonwilliams reviewed by Tyler Hobbs for CASSANDRA-6622
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
Sleep for RING_DELAY before replacing with same IP
Patch by brandonwilliams reviewed by Tyler Hobbs for CASSANDRA-6622
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt