HADOOP-3128.  Merge -r 642478:642480 to branch-0.16 for 0.16.2 release

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.16@642481 13f79535-47bb-0310-9956-ffa450edef68
2 files changed