Fix yaml snitch reconnect trick

Patch by Holger Bornträger, reviewed by brandonwilliams for CASSANDRA-7912
Merge branch 'cassandra-2.0' into cassandra-2.1