Better messaging on URI failure on cassandra.config
Patch by Josh McKenzie; review by Lyuben Todorov for CASSANDRA-7398
Merge branch 'cassandra-2.1' into trunk