(cherry picked from commit 02653add98f34deedc27f4da2254d25e83e55b58) (cherry picked from commit 42b55ff23e5fa30e00a6b56df92777a1899a1952) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (cherry picked from commit 83200450f67c1fe2b17385ade23051d83c7354bf) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt