Ec2Snitch - use systemtable when gossip info is not available
Patch by Vijay, reviewed by Brandon Williams for CASSANDRA-5171
fix test for CASSANDRA-5166
Merge branch 'cassandra-1.1' into cassandra-1.2