fixup hdfs-2.0 makefile
Merge branch 'master' into develop: meta only