HADOOP-10989. Merging change r1619659 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619660 13f79535-47bb-0310-9956-ffa450edef68
Revert HADOOP-10759 due to aw veto

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