svn merge -c 1423189 from trunk for HADOOP-9140 Cleanup rpc PB protos.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483137 13f79535-47bb-0310-9956-ffa450edef68