extension points for config
merge discovery changes (rack & datacenter) by axle-h
fixed utf8 deserialization pb for string
Merge remote-tracking branch 'upstream/master'

Conflicts:
	CassandraSharp/Discovery/SystemPeersDiscoveryService.cs