Allow log4j-server.properties to be a symlink.
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6170
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/CassandraDaemon.java