merge -c 1503830 FIXES: HADOOP-9683. [RPC v9] Wrap IpcConnectionContext in RPC headers (daryn)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1503832 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1503898 merging from branch-2 to fix HDFS-4999.

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