Fix repair hanging silently on an unexpected error

patch by yukim; reviewed by slebresne for CASSANDRA-5229
Fix Ec2Snitch regression introduced by CASSANDRA-5171

patch by vijay2win; reviewed by driftx and arya for CASSANDRA-5432
Merge branch 'cassandra-1.2' into trunk