fix symlinks to data dir not working; patch by yukim reviewed by jbellis for CASSANDRA-5185
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt