a8b7817739
(cherry picked from commit 313f03bfdab32cf365bc3470c5f9b6928a24f099) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java (cherry picked from commit c2708bc5fbf212ae6c48084442748c3265ddccd7)