send dc-local replicas inline instead of putting them in a Map
patch by jbellis; reviewed by dbrosius for CASSANDRA-5538
Reduce SSTableLoader memory usage
patch by jbellis; reviewed by dbrosius for CASSANDRA-5555
merge from 1.2
Fix test_thrift_server.TestMutations.test_describe_token_map
Merge remote-tracking branch 'origin/trunk' into trunk
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	test/system/test_thrift_server.py