HADOOP-8711. Merge 1478426 and 1478429 from branch-1

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