Merge -c 1496741 from trunk to branch-2.1-beta to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1496743 13f79535-47bb-0310-9956-ffa450edef68
Merged HADOOP-9619 svn merge -c 1495564

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1496760 13f79535-47bb-0310-9956-ffa450edef68
Merge -c 1496751 from trunk to branch-2.1-beta to fix YARN-869. Move ResourceManagerAdministrationProtocol out of main YARN api. Contributed by Vinod K V.

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