(cherry picked from commit d008b5515304b42faeb48e542c8c27586b8564eb) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(cherry picked from commit d008b5515304b42faeb48e542c8c27586b8564eb) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java