Fix propertyFileSnitch default DC/Rack behavior

patch by slebresne; reviewed by jbellis for CASSANDRA-5285
Merge branch 'cassandra-1.2' into trunk