![Stephen O'Donnell](/assets/img/avatar_default.png)
(cherry picked from commit 34a973a90ef89b633c9b5c13a79aa1ac11c92eb5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
(cherry picked from commit 34a973a90ef89b633c9b5c13a79aa1ac11c92eb5) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml