Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit bd46bdf9f9244f3f3474d316255ac98717ed5719) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml (cherry picked from commit d7560c866ecbfcd533a43890522ccb8b732a5382)