(cherry picked from commit e59f6fad6a8849cfab6acbf012f338d9cc7dd63c) # Conflicts: # hadoop-common-project/hadoop-common/CHANGES.txt
(cherry picked from commit e59f6fad6a8849cfab6acbf012f338d9cc7dd63c) # Conflicts: # hadoop-common-project/hadoop-common/CHANGES.txt