Potentially use non-local hosts in CqlConfigHelper

patch by jlewandowski; reviewed by alexliu68 for CASSANDRA-7906
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java