HADOOP-9247. Merge r1438698 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439531 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4444. Mrege 1439559 from trunk.

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-4803 from trunk. Remove duplicate copy of TestIndexCache. Contributed by Mariappan Asokan


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439591 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9255. relnotes.py missing last jira (tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439601 13f79535-47bb-0310-9956-ffa450edef68
merge -r 1439652:1439653 Merging YARN-133

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439655 13f79535-47bb-0310-9956-ffa450edef68
merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
Revert HADOOP-9241 from branch-2 as well.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439772 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of https://github.com/griddynamics/yhadoop-common into branch-2-gd

Conflicts:
	pom.xml