cassandra-stress: fix support for NetworkTopologyStrategy

patch by benedict; reviewed by yukim for CASSANDRA-7945
Merge branch 'cassandra-2.1' into trunk