send dc-local replicas inline instead of putting them in a Map
patch by jbellis; reviewed by dbrosius for CASSANDRA-5538
merge from 1.2
Fix RangeSliceCommand serialization for SCs for 1.2 nodes
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
Remove unused CassandraServer methods
have BulkLoader ignore snapshot directories
patch by jaymé reviewed by dbrosius for cassandra-5587
Merge branch 'cassandra-1.2' into trunk
fix SnitchProperties logging context
patch by cburroughs reviewed by dbrosius for cassandra-5602
Merge branch 'cassandra-1.2' into trunk
Expose whether jna is enabled and memory is locked via JMX
patch by dbrosius reviewed by jbellis for cassandra-5508
Expose whether jna is enabled and memory is locked via JMX -- add new file
Adding Composer types

- New types for the clients
Updating usages of the composer