svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707


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