Merge r1595117 and r1595128 from branch-2.

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