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