HADOOP-10335: Merging r1618484 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618485 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10335. Undo checkin to resolve test build issue.

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