Fix RoundTripTest
Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Ec2Snitch - use systemtable when gossip info is not available
Patch by Vijay, reviewed by Brandon Williams for CASSANDRA-5171
Merge branch 'cassandra-1.2' into trunk
fix test for CASSANDRA-5166
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk