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