HDFS-5616: now working for new sub-directories