some fixes
Merge branch 'conf' of https://github.com/rootfs/tachyon into conf

Conflicts:
	main/src/test/java/tachyon/conf/FileConfTest.java