Merge -r 1196410:1196412 from trunk to branch-0.23 to fix HADOOP-7789.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196413 13f79535-47bb-0310-9956-ffa450edef68
4 files changed