fix terrier's ways of traversing hdfs dirs into new hadoop api
resolve conflicts