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
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	build.xml