Revert "Explicitly use Long.MAX_VALUE timestamp for counter deletions"

This reverts commit 5fe7557627fac6ace2554a4f8ef552c9d9512490.

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

Conflicts:
	src/java/org/apache/cassandra/cql/AbstractModification.java
	src/java/org/apache/cassandra/cql/DeleteStatement.java
	src/java/org/apache/cassandra/cql/UpdateStatement.java
Add replace_address_first_boot flag to only replace if not bootstrapped.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7356
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Display generation/heartbeat in gossipinfo

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7333
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Avoid incremental compaction on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7365
Merge branch 'cassandra-2.1' into trunk
Modify system tcp keepalive settings in Windows install scripts
patch by Josh McKenzie; tested by Philip Thompson for CASSANDRA-7348
Merge branch 'cassandra-2.1' into trunk
Don't output a stacktrace when removenode force is errantly called

Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6397
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Track metrics at a keyspace level

Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539
Merge branch 'cassandra-1.2' into cassandra-2.0
Track metrics at a keyspace level

Patch by brandonwilliams, reviewed by yukim for CASSANDRA-6539