Improve PropertyFileSnitch log formatting

Patch by Liang Xie; reviewed by Tyler Hobbs for CASSANDRA-8183
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt