HDFS-6099: convert addChildWithName calls to mkdirs