dbf1ef4aff
(cherry picked from commit 2bbeae324029d7ad19aa21a9b8a663c7890776f9) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java