Change-Id: I9411dfb1dd4605cbcc515ca3361218d35d7c5fe3 (cherry picked from commit 0087734cc1e18e029ea39f06ca25c8a7d60af004) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Change-Id: I9411dfb1dd4605cbcc515ca3361218d35d7c5fe3 (cherry picked from commit 0087734cc1e18e029ea39f06ca25c8a7d60af004) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt