Make-Ec2Region-s-datacenter-name-configurable
patch by Jason Brown; reviewed by Vijay for CASSANDRA-5155
convert default marshallers list to map for better readability
patch by dbrosius reviewed by bwilliams for CASSANDRA-5109
update changes.txt for 5109
Merge branch 'cassandra-1.1 into cassandra-1.2
remove merge markers