CQL3: support pre-epoch longs for TimestampType

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6212
CASSANDRA-6212 CHANGES.txt
Add reloadtriggers command to nodetool

patch by Suresh; reviewed by Aleksey Yeschenko for CASSANDRA-4949
Fix altering column types

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6185
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/ColumnDefinition.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
ninja NodeProbe compactionHistory() -> getCompactionHistory()
cqlsh: ignore empty 'value alias' in DESCRIBE

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6139
BM.forceBatchlogReplay() should be executed in batchlogTasks

follow-up to CASSANDRA-6079
Merge branch 'cassandra-1.2' into cassandra-2.0
cqlsh: fix CREATE/ALTER WITH completion

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
remove calculation of unused  expected compacted filesize
Merge branch 'cassandra-1.2' into cassandra-2.0
Backport CASSANDRA-6196 to 1.2

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6196
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	bin/cqlsh
Revert use of speculative retries by default for now
Fix SSTableLoader

patch by thobbs; reviewed by slebresne for CASSANDRA-6205
License and versions for 2.0.2 release
Fix harmless NPE in MM/HHOM
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-5185
Merge branch 'cassandra-1.2' into cassandra-2.0
Reject bootstrapping endpoints that are already in the ring with
different gossip data
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-5571